diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..c5c054ff
Binary files /dev/null and b/.DS_Store differ
diff --git a/AutorestSwift.xcworkspace/xcshareddata/IDETemplateMacros.plist b/AutorestSwift.xcworkspace/xcshareddata/IDETemplateMacros.plist
deleted file mode 100644
index 975f6a75..00000000
--- a/AutorestSwift.xcworkspace/xcshareddata/IDETemplateMacros.plist
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>FILEHEADER</key>
-	<string> --------------------------------------------------------------------------
-//
-// Copyright (c) Microsoft Corporation. All rights reserved.
-//
-// The MIT License (MIT)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the &quot;&quot;Software&quot;&quot;), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-//
-// --------------------------------------------------------------------------</string>
-</dict>
-</plist>
diff --git a/AutorestSwift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AutorestSwift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d98100..00000000
--- a/AutorestSwift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/Package.swift b/Package.swift
index 1a5cb75c..47ddb9e1 100644
--- a/Package.swift
+++ b/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/tjprescott/Yams.git", .branch("CircularReferences")),
-        .package(url: "https://github.com/stencilproject/Stencil.git", .branch("trim_whitespace")),
+        .package(url: "https://github.com/stencilproject/Stencil.git", .branch("master")),
         .package(url: "https://github.com/apple/swift-nio", from: "2.0.0"),
         .package(
             name: "AzureCore",
diff --git a/Podfile b/Podfile
index 0c19e20c..743a87f5 100644
--- a/Podfile
+++ b/Podfile
@@ -8,7 +8,7 @@ target 'AutorestSwift' do
 
   # Pods for AutorestSwift
   pod 'Yams', :git => 'https://github.com/tjprescott/Yams.git', :branch => 'CircularReferences'
-  pod 'Stencil', :git => 'https://github.com/stencilproject/Stencil.git', :branch => 'trim_whitespace'
+  pod 'Stencil', :git => 'https://github.com/stencilproject/Stencil.git', :branch => 'master'
   pod 'SwiftFormat/CLI'
   pod 'SwiftLint'
   pod 'SwiftNIO'
diff --git a/src/AutorestSwift/Code Generator/SwiftGenerator.swift b/src/AutorestSwift/Code Generator/SwiftGenerator.swift
index 904b996f..ca43cc8d 100644
--- a/src/AutorestSwift/Code Generator/SwiftGenerator.swift	
+++ b/src/AutorestSwift/Code Generator/SwiftGenerator.swift	
@@ -127,7 +127,7 @@ class SwiftGenerator: CodeGenerator {
         try optionsUrl.ensureExists()
         try utilUrl.ensureExists()
         try jazzyUrl.ensureExists()
-        SharedLogger.info("Base URL: \(baseUrl.path)")
+        SharedLogger.info("Base URL: \(self.baseUrl.path)")
 
         // Create PatchUtil.swift file
         try render(
diff --git a/src/AutorestSwift/JsonRpc/Server.swift b/src/AutorestSwift/JsonRpc/Server.swift
index a5f09d01..0216dbac 100644
--- a/src/AutorestSwift/JsonRpc/Server.swift
+++ b/src/AutorestSwift/JsonRpc/Server.swift
@@ -58,7 +58,7 @@ public final class ChannelServer {
                             name: "ServerHandler"
                         )
                     }
-            }.withPipes(inputDescriptor: STDIN_FILENO, outputDescriptor: STDOUT_FILENO)
+            }.takingOwnershipOfDescriptors(input: STDIN_FILENO, output: STDOUT_FILENO)
 
         state = .starting
         return bootstrap.eventLoop.makeSucceededFuture(self)
diff --git a/src/AutorestSwift/Utils/StencilUtil.swift b/src/AutorestSwift/Utils/StencilUtil.swift
index 366e245c..ba279cb5 100644
--- a/src/AutorestSwift/Utils/StencilUtil.swift
+++ b/src/AutorestSwift/Utils/StencilUtil.swift
@@ -30,7 +30,7 @@ import Stencil
 
 public func renderTemplate(filename: String, dictionary: [String: Any]) throws -> String {
     let fsLoader = FileSystemLoader(bundle: [Bundle.main])
-    let environment = Environment(loader: fsLoader, trimBehavior: TrimBehavior.smart)
+    let environment = Environment(loader: fsLoader, trimBehaviour: TrimBehaviour.smart)
 
     return try environment.renderTemplate(name: filename, context: dictionary)
 }