diff --git a/samples/DatabaseErrorPageSample/Startup.cs b/samples/DatabaseErrorPageSample/Startup.cs
index 18a8d80d63..c82b06a288 100644
--- a/samples/DatabaseErrorPageSample/Startup.cs
+++ b/samples/DatabaseErrorPageSample/Startup.cs
@@ -29,13 +29,13 @@ namespace DatabaseErrorPageSample
 
         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/DeveloperExceptionPageSample/Startup.cs b/samples/DeveloperExceptionPageSample/Startup.cs
index a0461ba6c5..c7514055fb 100644
--- a/samples/DeveloperExceptionPageSample/Startup.cs
+++ b/samples/DeveloperExceptionPageSample/Startup.cs
@@ -21,13 +21,13 @@ namespace DeveloperExceptionPageSample
 
         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();
         }
     }
 }
\ No newline at end of file
diff --git a/samples/ElmPageSample/Startup.cs b/samples/ElmPageSample/Startup.cs
index ac8eeca146..23db0508fc 100644
--- a/samples/ElmPageSample/Startup.cs
+++ b/samples/ElmPageSample/Startup.cs
@@ -31,13 +31,13 @@ namespace ElmPageSample
 
         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/ExceptionHandlerSample/Startup.cs b/samples/ExceptionHandlerSample/Startup.cs
index e122b01901..5b0b0afe13 100644
--- a/samples/ExceptionHandlerSample/Startup.cs
+++ b/samples/ExceptionHandlerSample/Startup.cs
@@ -58,13 +58,13 @@ namespace ExceptionHandlerSample
 
         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/MiddlewareAnalysisSample/Startup.cs b/samples/MiddlewareAnalysisSample/Startup.cs
index 3b228428f1..bce5492b39 100644
--- a/samples/MiddlewareAnalysisSample/Startup.cs
+++ b/samples/MiddlewareAnalysisSample/Startup.cs
@@ -85,13 +85,13 @@ namespace MiddlewareAnaysisSample
 
         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();
         }
 
         public class TestDiagnosticListener
diff --git a/samples/RuntimeInfoPageSample/Startup.cs b/samples/RuntimeInfoPageSample/Startup.cs
index 9c4452f4ad..9d8945650a 100644
--- a/samples/RuntimeInfoPageSample/Startup.cs
+++ b/samples/RuntimeInfoPageSample/Startup.cs
@@ -21,13 +21,13 @@ namespace RuntimeInfoPageSample
 
         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/StatusCodePagesSample/Startup.cs b/samples/StatusCodePagesSample/Startup.cs
index 35721fdf23..8c731268c1 100644
--- a/samples/StatusCodePagesSample/Startup.cs
+++ b/samples/StatusCodePagesSample/Startup.cs
@@ -104,13 +104,13 @@ namespace StatusCodePagesSample
 
         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();
         }
     }
 }
\ No newline at end of file
diff --git a/samples/WelcomePageSample/Startup.cs b/samples/WelcomePageSample/Startup.cs
index 42ee635841..b1be5b4907 100644
--- a/samples/WelcomePageSample/Startup.cs
+++ b/samples/WelcomePageSample/Startup.cs
@@ -12,13 +12,13 @@ namespace WelcomePageSample
 
         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.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
index af70512f26..892cd76156 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
@@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Successful_requests_pass_thru()
         {
-            var builder = new WebApplicationBuilder().Configure(app => app
+            var builder = new WebHostBuilder().Configure(app => app
                 .UseDatabaseErrorPage()
                 .UseMiddleware<SuccessMiddleware>());
             var server = new TestServer(builder);
@@ -55,7 +55,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Non_database_exceptions_pass_thru()
         {
-            var builder = new WebApplicationBuilder().Configure(app => app
+            var builder = new WebHostBuilder().Configure(app => app
                 .UseDatabaseErrorPage()
                 .UseMiddleware<ExceptionMiddleware>());
             var server = new TestServer(builder);
@@ -255,7 +255,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
 
             using (var database = SqlServerTestStore.CreateScratch())
             {
-                var builder = new WebApplicationBuilder()
+                var builder = new WebHostBuilder()
                     .Configure(app =>
                     {
                         app.UseDatabaseErrorPage(new DatabaseErrorPageOptions
@@ -293,7 +293,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
             {
                 var logProvider = new TestLoggerProvider();
 
-                var builder = new WebApplicationBuilder()
+                var builder = new WebHostBuilder()
                     .Configure(app =>
                     {
                         app.UseDatabaseErrorPage();
@@ -411,7 +411,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         {
             using (var database = SqlServerTestStore.CreateScratch())
             {
-                var builder = new WebApplicationBuilder()
+                var builder = new WebHostBuilder()
                     .Configure(app =>
                     {
                         app.UseDatabaseErrorPage();
diff --git a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
index e2e261a028..a0a6887abf 100644
--- a/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Entity.FunctionalTests/MigrationsEndPointMiddlewareTest.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Non_migration_requests_pass_thru()
         {
-            var builder = new WebApplicationBuilder().Configure(app => app
+            var builder = new WebHostBuilder().Configure(app => app
                 .UseMigrationsEndPoint()
                 .UseMiddleware<SuccessMiddleware>());
             var server = new TestServer(builder);
@@ -73,7 +73,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
 
                 var path = useCustomPath ? new PathString("/EndPoints/ApplyMyMigrations") : MigrationsEndPointOptions.DefaultPath;
 
-                var builder = new WebApplicationBuilder()
+                var builder = new WebHostBuilder()
                     .Configure(app =>
                     {
                         if (useCustomPath)
@@ -125,7 +125,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Context_type_not_specified()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseMigrationsEndPoint();
@@ -145,7 +145,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Invalid_context_type_specified()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseMigrationsEndPoint();
@@ -169,7 +169,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
         [Fact]
         public async Task Context_not_registered_in_services()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app => app.UseMigrationsEndPoint())
                 .ConfigureServices(services => services.AddEntityFramework().AddSqlServer());
             var server = new TestServer(builder);
@@ -196,7 +196,7 @@ namespace Microsoft.AspNet.Diagnostics.Entity.Tests
                 var optionsBuilder = new DbContextOptionsBuilder();
                 optionsBuilder.UseSqlServer(database.ConnectionString);
 
-                var builder = new WebApplicationBuilder()
+                var builder = new WebHostBuilder()
                     .Configure(app => app.UseMigrationsEndPoint())
                     .ConfigureServices(services =>
                     {
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
index 069822e905..dead2f8c24 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs
@@ -489,7 +489,7 @@ namespace Microsoft.AspNet.Diagnostics
         {
             // Arrange
             DiagnosticListener diagnosticListener = null;
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ExceptionHandlerTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/ExceptionHandlerTest.cs
index 5cf130d007..f36ffc3e05 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/ExceptionHandlerTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/ExceptionHandlerTest.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Diagnostics
         [InlineData(HttpStatusCode.InternalServerError)]
         public async Task OnlyHandles_UnhandledExceptions(HttpStatusCode expectedStatusCode)
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseExceptionHandler("/handle-errors");
@@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Diagnostics
         [Fact]
         public async Task DoesNotHandle_UnhandledExceptions_WhenResponseAlreadyStarted()
         {
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.Use(async (httpContext, next) =>
@@ -108,7 +108,7 @@ namespace Microsoft.AspNet.Diagnostics
         public async Task ClearsResponseBuffer_BeforeRequestIsReexecuted()
         {
             var expectedResponseBody = "New response body";
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     // add response buffering
@@ -180,7 +180,7 @@ namespace Microsoft.AspNet.Diagnostics
         {
             var expiresTime = DateTime.UtcNow.AddDays(5).ToString("R");
             var expectedResponseBody = "Handled error in a custom way.";
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseExceptionHandler("/handle-errors");
@@ -230,7 +230,7 @@ namespace Microsoft.AspNet.Diagnostics
         {
             var expiresTime = DateTime.UtcNow.AddDays(10).ToString("R");
             var expectedResponseBody = "Hello world!";
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.UseExceptionHandler("/handle-errors");
@@ -280,7 +280,7 @@ namespace Microsoft.AspNet.Diagnostics
         public async Task DoesNotClearCacheHeaders_WhenResponseHasAlreadyStarted()
         {
             var expiresTime = DateTime.UtcNow.AddDays(10).ToString("R");
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     app.Use(async (httpContext, next) =>
@@ -350,7 +350,7 @@ namespace Microsoft.AspNet.Diagnostics
             // Arrange
             DiagnosticListener diagnosticListener = null;
 
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();
diff --git a/test/Microsoft.AspNet.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs b/test/Microsoft.AspNet.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs
index 4f1327d929..dfcff9659c 100644
--- a/test/Microsoft.AspNet.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs
+++ b/test/Microsoft.AspNet.MiddlewareAnalysis.Tests/MiddlewareAnalysisTests.cs
@@ -19,7 +19,7 @@ namespace Microsoft.AspNet.MiddlewareAnalysis
         {
             DiagnosticListener diagnosticListener = null;
 
-            var builder = new WebApplicationBuilder()
+            var builder = new WebHostBuilder()
                 .Configure(app =>
                 {
                     diagnosticListener = app.ApplicationServices.GetRequiredService<DiagnosticListener>();