diff --git a/src/Orchard/Environment/OrchardStarter.cs b/src/Orchard/Environment/OrchardStarter.cs
index c864ef091..a1a71201d 100644
--- a/src/Orchard/Environment/OrchardStarter.cs
+++ b/src/Orchard/Environment/OrchardStarter.cs
@@ -36,7 +36,7 @@ namespace Orchard.Environment {
             builder.RegisterType<DefaultCacheHolder>().As<ICacheHolder>().SingleInstance();
             builder.RegisterType<DefaultHostEnvironment>().As<IHostEnvironment>().SingleInstance();
             builder.RegisterType<DefaultBuildManager>().As<IBuildManager>().SingleInstance();
-            builder.RegisterType<WebFormsExtensionsVirtualPathProvider>().As<ICustomVirtualPathProvider>().SingleInstance();
+            builder.RegisterType<WebFormVirtualPathProvider>().As<ICustomVirtualPathProvider>().SingleInstance();
             builder.RegisterType<AppDataFolderRoot>().As<IAppDataFolderRoot>().SingleInstance();
             builder.RegisterType<DefaultExtensionCompiler>().As<IExtensionCompiler>().SingleInstance();
             builder.RegisterType<DefaultProjectFileParser>().As<IProjectFileParser>().SingleInstance();
diff --git a/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualFile.cs b/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualFile.cs
index 5f1e3370b..91415504c 100644
--- a/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualFile.cs
+++ b/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualFile.cs
@@ -1,12 +1,12 @@
-using System.IO;
+using System.IO;
 using System.Web.Hosting;
 
 namespace Orchard.FileSystems.Dependencies {
-    public class WebFormsExtensionsVirtualFile : VirtualFile {
+    public class WebFormVirtualFile : VirtualFile {
         private readonly VirtualFile _actualFile;
         private readonly string _assemblyDirective;
 
-        public WebFormsExtensionsVirtualFile(string virtualPath, VirtualFile actualFile, string assemblyDirective)
+        public WebFormVirtualFile(string virtualPath, VirtualFile actualFile, string assemblyDirective)
             : base(virtualPath) {
             _actualFile = actualFile;
             _assemblyDirective = assemblyDirective;
diff --git a/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs b/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs
index 8c9a0fdce..d1d926fb0 100644
--- a/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs
+++ b/src/Orchard/FileSystems/Dependencies/WebFormsExtensionsVirtualPathProvider.cs
@@ -8,14 +8,14 @@ using Orchard.FileSystems.VirtualPath;
 using Orchard.Logging;
 
 namespace Orchard.FileSystems.Dependencies {
-    public class WebFormsExtensionsVirtualPathProvider : VirtualPathProvider, ICustomVirtualPathProvider {
+    public class WebFormVirtualPathProvider : VirtualPathProvider, ICustomVirtualPathProvider {
         private readonly IDependenciesFolder _dependenciesFolder;
         private readonly IEnumerable<IExtensionLoader> _loaders;
         private readonly string[] _modulesPrefixes = { "~/Modules/", "/Modules/" };
         private readonly string[] _themesPrefixes = { "~/Themes/", "/Themes/" };
         private readonly string[] _extensions = { ".ascx", ".aspx", ".master" };
 
-        public WebFormsExtensionsVirtualPathProvider(IDependenciesFolder dependenciesFolder, IEnumerable<IExtensionLoader> loaders) {
+        public WebFormVirtualPathProvider(IDependenciesFolder dependenciesFolder, IEnumerable<IExtensionLoader> loaders) {
             _dependenciesFolder = dependenciesFolder;
             _loaders = loaders;
             Logger = NullLogger.Instance;
@@ -31,7 +31,7 @@ namespace Orchard.FileSystems.Dependencies {
             return Previous.FileExists(virtualPath);
         }
 
-        public override string GetFileHash(string virtualPath, System.Collections.IEnumerable virtualPathDependencies) {
+        public override string GetFileHash(string virtualPath, IEnumerable virtualPathDependencies) {
             var result = GetFileHashWorker(virtualPath, virtualPathDependencies);
             Logger.Information("GetFileHash(\"{0}\"): {1}", virtualPath, result);
             return result;
@@ -80,7 +80,7 @@ namespace Orchard.FileSystems.Dependencies {
                 Logger.Debug("  Assembly directive: {0}", file.Directive);
             }
 
-            return new WebFormsExtensionsVirtualFile(virtualPath, actualFile, file.Directive);
+            return new WebFormVirtualFile(virtualPath, actualFile, file.Directive);
         }
 
         private VirtualFile GetThemeCustomVirtualFile(string virtualPath, VirtualFile actualFile) {
@@ -94,7 +94,7 @@ namespace Orchard.FileSystems.Dependencies {
                 Logger.Debug("  Assembly directive: {0}", file.Directive);
             }
 
-            return new WebFormsExtensionsVirtualFile(virtualPath, actualFile, file.Directive);
+            return new WebFormVirtualFile(virtualPath, actualFile, file.Directive);
         }
 
         private VirtualFileOverride GetModuleVirtualOverride(string virtualPath) {