diff --git a/samples/HttpOverridesSample/Startup.cs b/samples/HttpOverridesSample/Startup.cs
index 2c1bbb9a0f..606fd20163 100644
--- a/samples/HttpOverridesSample/Startup.cs
+++ b/samples/HttpOverridesSample/Startup.cs
@@ -33,13 +33,13 @@ namespace HttpOverridesSample
         // Entry point for the application.
         public static void Main(string[] args)
         {
-            var application = new WebApplicationBuilder()
-                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+            var host = new WebHostBuilder()
+                .UseDefaultConfiguration(args)
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
 
-            application.Run();
+            host.Run();
         }
     }
 }
diff --git a/samples/ResponseBufferingSample/Startup.cs b/samples/ResponseBufferingSample/Startup.cs
index 985c08fe44..035c499bc6 100644
--- a/samples/ResponseBufferingSample/Startup.cs
+++ b/samples/ResponseBufferingSample/Startup.cs
@@ -37,13 +37,13 @@ namespace ResponseBufferingSample
         // Entry point for the application.
         public static void Main(string[] args)
         {
-            var application = new WebApplicationBuilder()
-                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+            var host = new WebHostBuilder()
+                .UseDefaultConfiguration(args)
                 .UseIISPlatformHandlerUrl()
                 .UseStartup<Startup>()
                 .Build();
 
-            application.Run();
+            host.Run();
         }
     }
 }
diff --git a/test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs b/test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
index fc07df25ec..e2cc8da5e5 100644
--- a/test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Buffering.Tests
         [Fact]
         public async Task BufferResponse_SetsContentLength()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseResponseBuffering();
@@ -48,7 +48,7 @@ namespace Microsoft.AspNet.Buffering.Tests
         [Fact]
         public async Task BufferResponseWithManualContentLength_NotReplaced()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseResponseBuffering();
@@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Buffering.Tests
         [Fact]
         public async Task Seek_AllowsResttingBuffer()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseResponseBuffering();
@@ -122,7 +122,7 @@ namespace Microsoft.AspNet.Buffering.Tests
         [Fact]
         public async Task SetPosition_AllowsResttingBuffer()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseResponseBuffering();
@@ -166,7 +166,7 @@ namespace Microsoft.AspNet.Buffering.Tests
         [Fact]
         public async Task SetLength_AllowsResttingBuffer()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseResponseBuffering();
@@ -210,7 +210,7 @@ namespace Microsoft.AspNet.Buffering.Tests
         [Fact]
         public async Task DisableBufferingViaFeature()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseResponseBuffering();
@@ -244,7 +244,7 @@ namespace Microsoft.AspNet.Buffering.Tests
         [Fact]
         public async Task DisableBufferingViaFeatureAfterFirstWrite_Flushes()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseResponseBuffering();
@@ -283,7 +283,7 @@ namespace Microsoft.AspNet.Buffering.Tests
         [Fact]
         public async Task FlushDisablesBuffering()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseResponseBuffering();
diff --git a/test/Microsoft.AspNet.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs b/test/Microsoft.AspNet.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs
index d739fc1043..5c4108ddfc 100644
--- a/test/Microsoft.AspNet.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.HttpOverrides
         public async Task XHttpMethodOverrideHeaderAvaiableChangesRequestMethod()
         {
             var assertsExecuted = false;
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseHttpMethodOverride();
@@ -40,7 +40,7 @@ namespace Microsoft.AspNet.HttpOverrides
         public async Task XHttpMethodOverrideHeaderUnavaiableDoesntChangeRequestMethod()
         {
             var assertsExecuted = false;
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseHttpMethodOverride();
@@ -62,7 +62,7 @@ namespace Microsoft.AspNet.HttpOverrides
         public async Task XHttpMethodOverrideFromGetRequestDoesntChangeMethodType()
         {
             var assertsExecuted = false;
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseHttpMethodOverride();
@@ -85,7 +85,7 @@ namespace Microsoft.AspNet.HttpOverrides
         public async Task FormFieldAvailableChangesRequestMethod()
         {
             var assertsExecuted = false;
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseHttpMethodOverride(new HttpMethodOverrideOptions()
@@ -116,7 +116,7 @@ namespace Microsoft.AspNet.HttpOverrides
         public async Task FormFieldUnavailableDoesNotChangeRequestMethod()
         {
             var assertsExecuted = false;
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseHttpMethodOverride(new HttpMethodOverrideOptions()
@@ -146,7 +146,7 @@ namespace Microsoft.AspNet.HttpOverrides
         public async Task FormFieldEmptyDoesNotChangeRequestMethod()
         {
             var assertsExecuted = false;
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseHttpMethodOverride(new HttpMethodOverrideOptions()
diff --git a/test/Microsoft.AspNet.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs b/test/Microsoft.AspNet.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs
index 7f148cbe48..1dd86d3bcd 100644
--- a/test/Microsoft.AspNet.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.HttpOverrides
         {
             var assertsExecuted = false;
 
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseOverrideHeaders(new OverrideHeaderOptions
@@ -44,7 +44,7 @@ namespace Microsoft.AspNet.HttpOverrides
         {
             var assertsExecuted = false;
 
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseOverrideHeaders(new OverrideHeaderOptions
@@ -71,7 +71,7 @@ namespace Microsoft.AspNet.HttpOverrides
         {
             var assertsExecuted = false;
 
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseOverrideHeaders(new OverrideHeaderOptions
@@ -98,7 +98,7 @@ namespace Microsoft.AspNet.HttpOverrides
         {
             var assertsExecuted = false;
 
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseOverrideHeaders(new OverrideHeaderOptions
@@ -132,7 +132,7 @@ namespace Microsoft.AspNet.HttpOverrides
         {
             var assertsExecuted = false;
 
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseOverrideHeaders(new OverrideHeaderOptions
@@ -163,7 +163,7 @@ namespace Microsoft.AspNet.HttpOverrides
         {
             var assertsExecuted = false;
 
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseOverrideHeaders(new OverrideHeaderOptions
@@ -194,7 +194,7 @@ namespace Microsoft.AspNet.HttpOverrides
         {
             var assertsExecuted = false;
 
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseOverrideHeaders(new OverrideHeaderOptions