diff --git a/src/Microsoft.AspNet.Mvc.Core/BuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/MvcApplicationBuilderExtensions.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Core/BuilderExtensions.cs
rename to src/Microsoft.AspNet.Mvc.Core/MvcApplicationBuilderExtensions.cs
index ca8c6144d3..cf222e1843 100644
--- a/src/Microsoft.AspNet.Mvc.Core/BuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/MvcApplicationBuilderExtensions.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Builder
     /// <summary>
     /// Extension methods for <see cref="IApplicationBuilder"/> to add MVC to the request execution pipeline.
     /// </summary>
-    public static class BuilderExtensions
+    public static class MvcApplicationBuilderExtensions
     {
         /// <summary>
         /// Adds MVC to the <see cref="IApplicationBuilder"/> request execution pipeline.
diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Routing/RouteBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Routing/WebApiCompatShimRouteBuilderExtensions.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.WebApiCompatShim/Routing/RouteBuilderExtensions.cs
rename to src/Microsoft.AspNet.Mvc.WebApiCompatShim/Routing/WebApiCompatShimRouteBuilderExtensions.cs
index 960ce31be7..00bd6283ae 100644
--- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Routing/RouteBuilderExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Routing/WebApiCompatShimRouteBuilderExtensions.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNet.Routing.Constraints;
 
 namespace Microsoft.AspNet.Builder
 {
-    public static class RouteBuilderExtensions
+    public static class WebApiCompatShimRouteBuilderExtensions
     {
         public static IRouteBuilder MapWebApiRoute(
             this IRouteBuilder routeCollectionBuilder,