diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs
index 9e40c3b1ed..21bc2a2d35 100644
--- a/samples/MvcSample.Web/Startup.cs
+++ b/samples/MvcSample.Web/Startup.cs
@@ -41,7 +41,7 @@ namespace MvcSample.Web
                     // Setup services with a test AssemblyProvider so that only the
                     // sample's assemblies are loaded. This prevents loading controllers from other assemblies
                     // when the sample is used in the Functional Tests.
-                    services.AddTransient<IControllerAssemblyProvider, TestAssemblyProvider<Startup>>();
+                    services.AddTransient<IAssemblyProvider, TestAssemblyProvider<Startup>>();
                     services.ConfigureOptions<MvcOptions>(options =>
                     {
                         options.Filters.Add(typeof(PassThroughAttribute), order: 17);
@@ -81,7 +81,7 @@ namespace MvcSample.Web
                     // Setup services with a test AssemblyProvider so that only the
                     // sample's assemblies are loaded. This prevents loading controllers from other assemblies
                     // when the sample is used in the Functional Tests.
-                    services.AddTransient<IControllerAssemblyProvider, TestAssemblyProvider<Startup>>();
+                    services.AddTransient<IAssemblyProvider, TestAssemblyProvider<Startup>>();
 
                     services.ConfigureOptions<MvcOptions>(options =>
                     {
diff --git a/samples/MvcSample.Web/TestAssemblyProvider.cs b/samples/MvcSample.Web/TestAssemblyProvider.cs
index b1db4925f5..98b5fd9f7c 100644
--- a/samples/MvcSample.Web/TestAssemblyProvider.cs
+++ b/samples/MvcSample.Web/TestAssemblyProvider.cs
@@ -17,7 +17,7 @@ namespace MvcSample.Web
     /// This is a generic type because it needs to instantiated by a service provider to replace
     /// a built-in MVC service.
     /// </remarks>
-    public class TestAssemblyProvider<T> : IControllerAssemblyProvider
+    public class TestAssemblyProvider<T> : IAssemblyProvider
     {
         public TestAssemblyProvider()
         {
diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs
index 82b589e303..6b3c8fb610 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs
@@ -21,17 +21,17 @@ namespace Microsoft.AspNet.Mvc
         // the reflected model is null.
         private const int DefaultAttributeRouteOrder = 0;
 
-        private readonly IControllerAssemblyProvider _controllerAssemblyProvider;
+        private readonly IAssemblyProvider _assemblyProvider;
         private readonly IActionDiscoveryConventions _conventions;
         private readonly IReadOnlyList<IFilter> _globalFilters;
         private readonly IEnumerable<IGlobalModelConvention> _modelConventions;
 
-        public ControllerActionDescriptorProvider(IControllerAssemblyProvider controllerAssemblyProvider,
+        public ControllerActionDescriptorProvider(IAssemblyProvider assemblyProvider,
                                                  IActionDiscoveryConventions conventions,
                                                  IGlobalFilterProvider globalFilters,
                                                  IOptionsAccessor<MvcOptions> optionsAccessor)
         {
-            _controllerAssemblyProvider = controllerAssemblyProvider;
+            _assemblyProvider = assemblyProvider;
             _conventions = conventions;
             _globalFilters = globalFilters.Filters;
             _modelConventions = optionsAccessor.Options.ApplicationModelConventions;
@@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Mvc
             var applicationModel = new GlobalModel();
             applicationModel.Filters.AddRange(_globalFilters);
 
-            var assemblies = _controllerAssemblyProvider.CandidateAssemblies;
+            var assemblies = _assemblyProvider.CandidateAssemblies;
             var types = assemblies.SelectMany(a => a.DefinedTypes);
             var controllerTypes = types.Where(_conventions.IsController);
 
diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs
similarity index 92%
rename from src/Microsoft.AspNet.Mvc.Core/DefaultControllerAssemblyProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs
index 5c2459d555..1a7abf2c4f 100644
--- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerAssemblyProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs
@@ -9,7 +9,7 @@ using Microsoft.Framework.Runtime;
 
 namespace Microsoft.AspNet.Mvc
 {
-    public class DefaultControllerAssemblyProvider : IControllerAssemblyProvider
+    public class DefaultAssemblyProvider : IAssemblyProvider
     {
         // List of Mvc assemblies that we'll use as roots for controller discovery.
         private static readonly HashSet<string> _mvcAssemblyList = new HashSet<string>(StringComparer.Ordinal)
@@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Mvc
 
         private readonly ILibraryManager _libraryManager;
 
-        public DefaultControllerAssemblyProvider(ILibraryManager libraryManager)
+        public DefaultAssemblyProvider(ILibraryManager libraryManager)
         {
             _libraryManager = libraryManager;
         }
diff --git a/src/Microsoft.AspNet.Mvc.Core/IControllerAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/IAssemblyProvider.cs
similarity index 87%
rename from src/Microsoft.AspNet.Mvc.Core/IControllerAssemblyProvider.cs
rename to src/Microsoft.AspNet.Mvc.Core/IAssemblyProvider.cs
index f8034ebf8c..a5a9cdfbb3 100644
--- a/src/Microsoft.AspNet.Mvc.Core/IControllerAssemblyProvider.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/IAssemblyProvider.cs
@@ -6,7 +6,7 @@ using System.Reflection;
 
 namespace Microsoft.AspNet.Mvc
 {
-    public interface IControllerAssemblyProvider
+    public interface IAssemblyProvider
     {
         IEnumerable<Assembly> CandidateAssemblies { get; }
     }
diff --git a/src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentSelector.cs b/src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentSelector.cs
index 1ffa129f16..87338f5bec 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentSelector.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentSelector.cs
@@ -9,9 +9,9 @@ namespace Microsoft.AspNet.Mvc
 {
     public class DefaultViewComponentSelector : IViewComponentSelector
     {
-        private readonly IControllerAssemblyProvider _assemblyProvider;
+        private readonly IAssemblyProvider _assemblyProvider;
 
-        public DefaultViewComponentSelector(IControllerAssemblyProvider assemblyProvider)
+        public DefaultViewComponentSelector(IAssemblyProvider assemblyProvider)
         {
             _assemblyProvider = assemblyProvider;
         }
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
index 223c35cbc9..757512fbc2 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
@@ -37,12 +37,12 @@ namespace Microsoft.AspNet.Mvc.Razor
         private readonly IMvcRazorHost _razorHost;
 
         public RazorCompilationService(IServiceProvider serviceProvider,
-                                       IControllerAssemblyProvider _controllerAssemblyProvider,
+                                       IAssemblyProvider _assemblyProvider,
                                        IMvcRazorHost razorHost)
         {
             _serviceProvider = serviceProvider;
             _razorHost = razorHost;
-            _cache = new CompilerCache(_controllerAssemblyProvider.CandidateAssemblies);
+            _cache = new CompilerCache(_assemblyProvider.CandidateAssemblies);
         }
 
         /// <inheritdoc />
diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs
index 802650cb8d..bc7e5816e5 100644
--- a/src/Microsoft.AspNet.Mvc/MvcServices.cs
+++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs
@@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Mvc
                 DefaultActionConstraintProvider>();
 
             yield return describe.Transient<IActionInvokerFactory, ActionInvokerFactory>();
-            yield return describe.Transient<IControllerAssemblyProvider, DefaultControllerAssemblyProvider>();
+            yield return describe.Transient<IAssemblyProvider, DefaultAssemblyProvider>();
             yield return describe.Transient<IActionDiscoveryConventions, DefaultActionDiscoveryConventions>();
 
             // The host is designed to be discarded after consumption and is very inexpensive to initialize.
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs
index d9822ca681..316d0ed481 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs
@@ -196,7 +196,7 @@ namespace Microsoft.AspNet.Mvc
         private ControllerActionDescriptorProvider GetActionDescriptorProvider(
             IActionDiscoveryConventions actionDiscoveryConventions  = null)
         {
-            var controllerAssemblyProvider = new StaticControllerAssemblyProvider();
+            var assemblyProvider = new StaticAssemblyProvider();
 
             if (actionDiscoveryConventions == null)
             {
@@ -208,7 +208,7 @@ namespace Microsoft.AspNet.Mvc
             }
 
             return new ControllerActionDescriptorProvider(
-                                        controllerAssemblyProvider,
+                                        assemblyProvider,
                                         actionDiscoveryConventions,
                                         new TestGlobalFilterProvider(),
                                         new MockMvcOptionsAccessor());
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs
index 3686f7e1f5..9ceb03e447 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs
@@ -1334,7 +1334,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             var conventions = new StaticActionDiscoveryConventions(controllerTypeInfo);
 
-            var assemblyProvider = new Mock<IControllerAssemblyProvider>();
+            var assemblyProvider = new Mock<IAssemblyProvider>();
             assemblyProvider
                 .SetupGet(ap => ap.CandidateAssemblies)
                 .Returns(new Assembly[] { controllerTypeInfo.Assembly });
@@ -1353,7 +1353,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             var conventions = new StaticActionDiscoveryConventions(controllerTypeInfo);
 
-            var assemblyProvider = new Mock<IControllerAssemblyProvider>();
+            var assemblyProvider = new Mock<IAssemblyProvider>();
             assemblyProvider
                 .SetupGet(ap => ap.CandidateAssemblies)
                 .Returns(new Assembly[] { controllerTypeInfo.First().Assembly });
@@ -1373,7 +1373,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             var conventions = new StaticActionDiscoveryConventions(type);
 
-            var assemblyProvider = new Mock<IControllerAssemblyProvider>();
+            var assemblyProvider = new Mock<IAssemblyProvider>();
             assemblyProvider
                 .SetupGet(ap => ap.CandidateAssemblies)
                 .Returns(new Assembly[] { type.Assembly });
@@ -1389,7 +1389,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             var conventions = new StaticActionDiscoveryConventions(controllerTypeInfos);
 
-            var assemblyProvider = new Mock<IControllerAssemblyProvider>();
+            var assemblyProvider = new Mock<IAssemblyProvider>();
             assemblyProvider
                 .SetupGet(ap => ap.CandidateAssemblies)
                 .Returns(controllerTypeInfos.Select(cti => cti.Assembly).Distinct());
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionDiscoveryConventionsActionSelectionTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionDiscoveryConventionsActionSelectionTests.cs
index ca3f70af72..de2e369f1c 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionDiscoveryConventionsActionSelectionTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionDiscoveryConventionsActionSelectionTests.cs
@@ -100,10 +100,10 @@ namespace Microsoft.AspNet.Mvc
         private ControllerActionDescriptorProvider GetActionDescriptorProvider(DefaultActionDiscoveryConventions actionDiscoveryConventions)
         {
             var assemblies = new Assembly[] { typeof(DefaultActionDiscoveryConventionsActionSelectionTests).GetTypeInfo().Assembly, };
-            var controllerAssemblyProvider = new Mock<IControllerAssemblyProvider>();
-            controllerAssemblyProvider.SetupGet(x => x.CandidateAssemblies).Returns(assemblies);
+            var AssemblyProvider = new Mock<IAssemblyProvider>();
+            AssemblyProvider.SetupGet(x => x.CandidateAssemblies).Returns(assemblies);
             return new ControllerActionDescriptorProvider(
-                                        controllerAssemblyProvider.Object,
+                                        AssemblyProvider.Object,
                                         actionDiscoveryConventions,
                                         new TestGlobalFilterProvider(),
                                         new MockMvcOptionsAccessor());
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerAssemblyProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs
similarity index 91%
rename from test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerAssemblyProviderTests.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs
index b478745a75..d04c9f82e0 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerAssemblyProviderTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs
@@ -11,7 +11,7 @@ using Xunit;
 
 namespace Microsoft.AspNet.Mvc.Core
 {
-    public class DefaultControllerAssemblyProviderTests
+    public class DefaultAssemblyProviderTests
     {
         [Fact]
         public void CandidateAssemblies_IgnoresMvcAssemblies()
@@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.Core
                         CreateLibraryInfo("SomeRandomAssembly"),
                    })
                    .Verifiable();
-            var provider = new DefaultControllerAssemblyProvider(manager.Object);
+            var provider = new DefaultAssemblyProvider(manager.Object);
 
             // Act
             var candidates = provider.GetCandidateLibraries();
@@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Mvc.Core
                    .Returns(new[] { CreateLibraryInfo("Bar") });
             manager.Setup(f => f.GetReferencingLibraries("Microsoft.AspNet.Mvc"))
                    .Returns(new[] { CreateLibraryInfo("Baz") });
-            var provider = new DefaultControllerAssemblyProvider(manager.Object);
+            var provider = new DefaultAssemblyProvider(manager.Object);
 
             // Act
             var candidates = provider.GetCandidateLibraries();
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/StaticControllerAssemblyProvider.cs b/test/Microsoft.AspNet.Mvc.Core.Test/StaticAssemblyProvider.cs
similarity index 76%
rename from test/Microsoft.AspNet.Mvc.Core.Test/StaticControllerAssemblyProvider.cs
rename to test/Microsoft.AspNet.Mvc.Core.Test/StaticAssemblyProvider.cs
index 1a00b99bec..fd2f685acf 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/StaticControllerAssemblyProvider.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/StaticAssemblyProvider.cs
@@ -7,9 +7,9 @@ using System.Reflection;
 namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
-    /// An implementation of IControllerAssemblyProvider that provides just this assembly.
+    /// An implementation of IAssemblyProvider that provides just this assembly.
     /// </summary>
-    public class StaticControllerAssemblyProvider : IControllerAssemblyProvider
+    public class StaticAssemblyProvider : IAssemblyProvider
     {
         public IEnumerable<Assembly> CandidateAssemblies
         {
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestAssemblyProvider.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestAssemblyProvider.cs
index 8ed5e855c6..1ef1bec151 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestAssemblyProvider.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestAssemblyProvider.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
     /// This is a generic type because it needs to instantiated by a service provider to replace
     /// a built-in MVC service.
     /// </remarks>
-    public class TestAssemblyProvider<T> : IControllerAssemblyProvider
+    public class TestAssemblyProvider<T> : IAssemblyProvider
     {
 	    public TestAssemblyProvider()
 	    {
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs
index eb23816a37..1973ecab12 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs
@@ -47,7 +47,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
 
             var configuration = new TestConfigurationProvider();
             configuration.Configuration.Set(
-                typeof(IControllerAssemblyProvider).FullName,
+                typeof(IAssemblyProvider).FullName,
                 providerType.AssemblyQualifiedName);
 
             services.AddInstance(
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorCompilationServiceTest.cs
index ab3100ea7c..20a36b3d50 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorCompilationServiceTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorCompilationServiceTest.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
                 .Returns(GetGeneratorResult())
                 .Verifiable();
 
-            var ap = new Mock<IControllerAssemblyProvider>();
+            var ap = new Mock<IAssemblyProvider>();
             ap.SetupGet(e => e.CandidateAssemblies)
                 .Returns(Enumerable.Empty<Assembly>())
                 .Verifiable();
@@ -68,7 +68,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
             var host = new Mock<IMvcRazorHost>();
             host.SetupAllProperties();
             host.Setup(h => h.GenerateCode(It.IsAny<string>(), It.IsAny<Stream>()))
-                .Returns(GetGeneratorResult());            var assemblyProvider = new Mock<IControllerAssemblyProvider>();
+                .Returns(GetGeneratorResult());            var assemblyProvider = new Mock<IAssemblyProvider>();
             assemblyProvider.SetupGet(e => e.CandidateAssemblies)
                             .Returns(Enumerable.Empty<Assembly>());
 
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
index 7fbd35ed9c..cf43ba53a2 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
@@ -252,7 +252,7 @@ namespace System.Web.Http
 
         private INestedProviderManager<ActionDescriptorProviderContext> CreateProvider()
         {
-            var assemblyProvider = new Mock<IControllerAssemblyProvider>();
+            var assemblyProvider = new Mock<IAssemblyProvider>();
             assemblyProvider
                 .SetupGet(ap => ap.CandidateAssemblies)
                 .Returns(new Assembly[] { typeof(ApiControllerActionDiscoveryTest).Assembly });