diff --git a/samples/TagHelperSample.Web/Startup.cs b/samples/TagHelperSample.Web/Startup.cs
index 0d2745f524..fa53f709e3 100644
--- a/samples/TagHelperSample.Web/Startup.cs
+++ b/samples/TagHelperSample.Web/Startup.cs
@@ -30,12 +30,7 @@ namespace TagHelperSample.Web
 
             app.UseStaticFiles();
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/src/Microsoft.AspNet.Mvc/BuilderExtensions.cs b/src/Microsoft.AspNet.Mvc/BuilderExtensions.cs
index d33436a798..16af874b02 100644
--- a/src/Microsoft.AspNet.Mvc/BuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc/BuilderExtensions.cs
@@ -11,12 +11,12 @@ using Microsoft.Framework.Internal;
 namespace Microsoft.AspNet.Builder
 {
     /// <summary>
-    /// Extension methods for <see cref="IApplicationBuilder"/> to add Mvc to the request execution pipeline.
+    /// Extension methods for <see cref="IApplicationBuilder"/> to add MVC to the request execution pipeline.
     /// </summary>
     public static class BuilderExtensions
     {
         /// <summary>
-        /// Adds Mvc to the <see cref="IApplicationBuilder"/> request execution pipeline.
+        /// Adds MVC to the <see cref="IApplicationBuilder"/> request execution pipeline.
         /// </summary>
         /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
         /// <returns>The <paramref name="app"/>.</returns>
@@ -30,7 +30,7 @@ namespace Microsoft.AspNet.Builder
         }
 
         /// <summary>
-        /// Adds Mvc to the <see cref="IApplicationBuilder"/> request execution pipeline
+        /// Adds MVC to the <see cref="IApplicationBuilder"/> request execution pipeline
         /// with a default route.
         /// </summary>
         /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
@@ -46,10 +46,10 @@ namespace Microsoft.AspNet.Builder
         }
 
         /// <summary>
-        /// Adds Mvc to the <see cref="IApplicationBuilder"/> request execution pipeline.
+        /// Adds MVC to the <see cref="IApplicationBuilder"/> request execution pipeline.
         /// </summary>
         /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
-        /// <param name="configureRoutes">A callback to configure Mvc routes.</param>
+        /// <param name="configureRoutes">A callback to configure MVC routes.</param>
         /// <returns>The <paramref name="app"/>.</returns>
         public static IApplicationBuilder UseMvc(
             [NotNull] this IApplicationBuilder app,
diff --git a/test/WebSites/BestEffortLinkGenerationWebSite/Startup.cs b/test/WebSites/BestEffortLinkGenerationWebSite/Startup.cs
index 573fd0b357..385fb53d4e 100644
--- a/test/WebSites/BestEffortLinkGenerationWebSite/Startup.cs
+++ b/test/WebSites/BestEffortLinkGenerationWebSite/Startup.cs
@@ -24,12 +24,7 @@ namespace BestEffortLinkGenerationWebSite
         {
             app.UseCultureReplacer();
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/CompositeViewEngineWebSite/Startup.cs b/test/WebSites/CompositeViewEngineWebSite/Startup.cs
index 496bcd521d..212d260275 100644
--- a/test/WebSites/CompositeViewEngineWebSite/Startup.cs
+++ b/test/WebSites/CompositeViewEngineWebSite/Startup.cs
@@ -25,12 +25,7 @@ namespace CompositeViewEngineWebSite
             app.UseCultureReplacer();
 
             // Add MVC to the request pipeline
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/FiltersWebSite/Startup.cs b/test/WebSites/FiltersWebSite/Startup.cs
index c4a9abd87b..0b32f37588 100644
--- a/test/WebSites/FiltersWebSite/Startup.cs
+++ b/test/WebSites/FiltersWebSite/Startup.cs
@@ -61,12 +61,7 @@ namespace FiltersWebSite
             app.UseMiddleware<AuthorizeBasicMiddleware>("Interactive");
             app.UseMiddleware<AuthorizeBasicMiddleware>("Api");
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/ModelBindingWebSite/Startup.cs b/test/WebSites/ModelBindingWebSite/Startup.cs
index 606dbcceb8..2fcfc12e0a 100644
--- a/test/WebSites/ModelBindingWebSite/Startup.cs
+++ b/test/WebSites/ModelBindingWebSite/Startup.cs
@@ -42,12 +42,7 @@ namespace ModelBindingWebSite
             app.UseErrorReporter();
 
             // Add MVC to the request pipeline
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/PrecompilationWebSite/Startup.cs b/test/WebSites/PrecompilationWebSite/Startup.cs
index 5a97b89547..f9d31f002f 100644
--- a/test/WebSites/PrecompilationWebSite/Startup.cs
+++ b/test/WebSites/PrecompilationWebSite/Startup.cs
@@ -19,12 +19,7 @@ namespace PrecompilationWebSite
         {
             app.UseCultureReplacer();
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
index 712c39022f..d11fe2cbdb 100644
--- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
+++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
@@ -36,12 +36,7 @@ namespace RazorPageExecutionInstrumentationWebSite
             });
 
             // Add MVC to the request pipeline
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/RazorWebSite/Startup.cs b/test/WebSites/RazorWebSite/Startup.cs
index 6dcb6c4219..18b61cd87d 100644
--- a/test/WebSites/RazorWebSite/Startup.cs
+++ b/test/WebSites/RazorWebSite/Startup.cs
@@ -32,12 +32,7 @@ namespace RazorWebSite
             app.UseCultureReplacer();
 
             // Add MVC to the request pipeline
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/RequestServicesWebSite/Startup.cs b/test/WebSites/RequestServicesWebSite/Startup.cs
index 0b654753c2..3fa36e1d66 100644
--- a/test/WebSites/RequestServicesWebSite/Startup.cs
+++ b/test/WebSites/RequestServicesWebSite/Startup.cs
@@ -23,12 +23,7 @@ namespace RequestServicesWebSite
             // Initializes the RequestId service for each request
             app.UseMiddleware<RequestIdMiddleware>();
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/ResponseCacheWebSite/Startup.cs b/test/WebSites/ResponseCacheWebSite/Startup.cs
index a030811727..9f4655f978 100644
--- a/test/WebSites/ResponseCacheWebSite/Startup.cs
+++ b/test/WebSites/ResponseCacheWebSite/Startup.cs
@@ -48,12 +48,7 @@ namespace ResponseCacheWebSite
         public void Configure(IApplicationBuilder app)
         {
             app.UseCultureReplacer();
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
\ No newline at end of file
diff --git a/test/WebSites/TagHelpersWebSite/Startup.cs b/test/WebSites/TagHelpersWebSite/Startup.cs
index f1c2109c43..7380ebbd96 100644
--- a/test/WebSites/TagHelpersWebSite/Startup.cs
+++ b/test/WebSites/TagHelpersWebSite/Startup.cs
@@ -18,12 +18,7 @@ namespace TagHelpersWebSite
         {
             app.UseCultureReplacer();
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/TempDataWebSite/Startup.cs b/test/WebSites/TempDataWebSite/Startup.cs
index e59dbacd6b..724e521e05 100644
--- a/test/WebSites/TempDataWebSite/Startup.cs
+++ b/test/WebSites/TempDataWebSite/Startup.cs
@@ -21,12 +21,7 @@ namespace TempDataWebSite
             app.UseCultureReplacer();
 
             app.UseInMemorySession();
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/ValueProvidersWebSite/Startup.cs b/test/WebSites/ValueProvidersWebSite/Startup.cs
index 9c1e5753ad..f31e0c5c94 100644
--- a/test/WebSites/ValueProvidersWebSite/Startup.cs
+++ b/test/WebSites/ValueProvidersWebSite/Startup.cs
@@ -24,12 +24,7 @@ namespace ValueProvidersWebSite
             app.UseCultureReplacer();
 
             // Add MVC to the request pipeline
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/VersioningWebSite/Startup.cs b/test/WebSites/VersioningWebSite/Startup.cs
index 2189bc9d5a..a3bee5fce9 100644
--- a/test/WebSites/VersioningWebSite/Startup.cs
+++ b/test/WebSites/VersioningWebSite/Startup.cs
@@ -20,12 +20,7 @@ namespace VersioningWebSite
         {
             app.UseCultureReplacer();
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }
diff --git a/test/WebSites/ViewComponentWebSite/Startup.cs b/test/WebSites/ViewComponentWebSite/Startup.cs
index 2a75336546..18f390d3a7 100644
--- a/test/WebSites/ViewComponentWebSite/Startup.cs
+++ b/test/WebSites/ViewComponentWebSite/Startup.cs
@@ -18,12 +18,7 @@ namespace ViewComponentWebSite
         {
             app.UseCultureReplacer();
 
-            app.UseMvc(routes =>
-            {
-                routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
-            });
+            app.UseMvcWithDefaultRoute();
         }
     }
 }