diff --git a/src/Orchard.Web/Core/ContentsLocation/ContentsLocationResourceManifest.cs b/src/Orchard.Web/Core/ContentsLocation/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Core/ContentsLocation/ContentsLocationResourceManifest.cs
rename to src/Orchard.Web/Core/ContentsLocation/ResourceManifest.cs
diff --git a/src/Orchard.Web/Core/Localization/Resources/LocalizationResourceManifest.cs b/src/Orchard.Web/Core/Localization/Resources/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Core/Localization/Resources/LocalizationResourceManifest.cs
rename to src/Orchard.Web/Core/Localization/Resources/ResourceManifest.cs
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 2c9734b42..fb619b8c1 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -74,7 +74,7 @@
     <Compile Include="Common\Fields\TextField.cs" />
     <Compile Include="Common\Security\AuthorizationEventHandler.cs" />
     <Compile Include="Common\Services\BbcodeFilter.cs" />
-    <Compile Include="ContentsLocation\ContentsLocationResourceManifest.cs" />
+    <Compile Include="ContentsLocation\ResourceManifest.cs" />
     <Compile Include="ContentsLocation\Models\LocationDefinition.cs" />
     <Compile Include="Common\Services\ICommonService.cs" />
     <Compile Include="Common\Services\CommonService.cs" />
@@ -96,7 +96,7 @@
     <Compile Include="Contents\Settings\ContentPartSettings.cs" />
     <Compile Include="Contents\Shapes.cs" />
     <Compile Include="Contents\ViewModels\PublishContentViewModel.cs" />
-    <Compile Include="Localization\Resources\LocalizationResourceManifest.cs" />
+    <Compile Include="Localization\Resources\ResourceManifest.cs" />
     <Compile Include="Localization\ViewModels\EditLocalizationViewModel.cs" />
     <Compile Include="Messaging\DataMigrations\MessagingDataMigration.cs" />
     <Compile Include="Messaging\Drivers\MessageSettingsPartDriver.cs" />
@@ -105,7 +105,7 @@
     <Compile Include="Messaging\Models\MessageSettingsPartRecord.cs" />
     <Compile Include="Messaging\Services\DefaultMessageManager.cs" />
     <Compile Include="Messaging\ViewModels\MessageSettingsPartViewModel.cs" />
-    <Compile Include="PublishLater\PublishLaterResourceManifest.cs" />
+    <Compile Include="PublishLater\ResourceManifest.cs" />
     <Compile Include="PublishLater\DataMigrations\PublishLaterDataMigration.cs" />
     <Compile Include="PublishLater\Drivers\PublishLaterPartDriver.cs" />
     <Compile Include="PublishLater\Models\PublishLaterPart.cs" />
@@ -113,7 +113,7 @@
     <Compile Include="PublishLater\Services\PublishLaterService.cs" />
     <Compile Include="PublishLater\Services\IPublishLaterService.cs" />
     <Compile Include="PublishLater\ViewModels\PublishLaterViewModel.cs" />
-    <Compile Include="Routable\RoutableResourceManifest.cs" />
+    <Compile Include="Routable\ResourceManifest.cs" />
     <Compile Include="Routable\Services\RoutableHomePageProvider.cs" />
     <Compile Include="Contents\ViewModels\ListContentsViewModel.cs" />
     <Compile Include="Contents\ViewModels\ListContentTypesViewModel.cs" />
@@ -208,7 +208,7 @@
     <Compile Include="Scheduling\Services\ScheduledTaskManager.cs" />
     <Compile Include="Scheduling\Services\ScheduledTaskExecutor.cs" />
     <Compile Include="Scheduling\Models\Task.cs" />
-    <Compile Include="Settings\SettingsResourceManifest.cs" />
+    <Compile Include="Settings\ResourceManifest.cs" />
     <Compile Include="Settings\DataMigrations\SettingsDataMigration.cs" />
     <Compile Include="Settings\Drivers\SiteSettingsPartDriver.cs" />
     <Compile Include="Settings\ViewModels\SiteCulturesViewModel.cs" />
@@ -233,7 +233,7 @@
     <Compile Include="Settings\Models\SiteSettingsPart.cs" />
     <Compile Include="Settings\Services\SiteService.cs" />
     <Compile Include="Settings\ViewModels\SiteSettingsPartViewModel.cs" />
-    <Compile Include="Shapes\CoreShapesResourceManifest.cs" />
+    <Compile Include="Shapes\ResourceManifest.cs" />
     <Compile Include="Shapes\CoreShapes.cs" />
     <Compile Include="XmlRpc\Controllers\HomeController.cs" />
     <Compile Include="XmlRpc\Controllers\LiveWriterController.cs" />
@@ -388,7 +388,6 @@
     <Content Include="Shapes\Views\Layout.cshtml" />
     <Content Include="Shapes\Views\Menu.cshtml" />
     <Content Include="Shapes\Views\MenuItem.cshtml" />
-
     <Content Include="Shapes\Views\Web.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Orchard.Web/Core/PublishLater/PublishLaterResourceManifest.cs b/src/Orchard.Web/Core/PublishLater/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Core/PublishLater/PublishLaterResourceManifest.cs
rename to src/Orchard.Web/Core/PublishLater/ResourceManifest.cs
diff --git a/src/Orchard.Web/Core/Routable/RoutableResourceManifest.cs b/src/Orchard.Web/Core/Routable/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Core/Routable/RoutableResourceManifest.cs
rename to src/Orchard.Web/Core/Routable/ResourceManifest.cs
diff --git a/src/Orchard.Web/Core/Settings/SettingsResourceManifest.cs b/src/Orchard.Web/Core/Settings/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Core/Settings/SettingsResourceManifest.cs
rename to src/Orchard.Web/Core/Settings/ResourceManifest.cs
diff --git a/src/Orchard.Web/Core/Shapes/CoreShapesResourceManifest.cs b/src/Orchard.Web/Core/Shapes/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Core/Shapes/CoreShapesResourceManifest.cs
rename to src/Orchard.Web/Core/Shapes/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
index f2e0dabab..8c97e4df2 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
@@ -74,7 +74,7 @@
     <Compile Include="Handlers\UnpublishingTaskHandler.cs" />
     <Compile Include="Models\ArchiveLaterPart.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ArchiveLaterResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Services\ArchiveLaterService.cs" />
     <Compile Include="Services\IArchiveLaterService.cs" />
     <Compile Include="ViewModels\ArchiveLaterViewModel.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/ArchiveLaterResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.ArchiveLater/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.ArchiveLater/ArchiveLaterResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.ArchiveLater/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index ab8c16cf7..d44ee7848 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -67,7 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
-    <Compile Include="BlogsResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Commands\BlogCommands.cs" />
     <Compile Include="Controllers\BlogAdminController.cs" />
     <Compile Include="DataMigrations\BlogsDataMigration.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/BlogsResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/BlogsResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
index 73a1021ed..6180ebec2 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -70,7 +70,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
-    <Compile Include="ContentTypesResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="ViewModels\AddPartsViewModel.cs" />
     <Compile Include="Controllers\AdminController.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ContentTypesResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.ContentTypes/ContentTypesResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.ContentTypes/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
index ad09f70ee..aad7631f6 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj
@@ -59,7 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
-    <Compile Include="IndexingResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Commands\IndexingCommands.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="DataMigrations\IndexingDataMigration.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/IndexingResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Indexing/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Indexing/IndexingResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.Indexing/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
index 007cd2639..4613973ac 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj
@@ -71,7 +71,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Controllers\AdminController.cs" />
-    <Compile Include="MediaResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="DataMigrations\MediaDataMigration.cs" />
     <Compile Include="Helpers\MediaHelpers.cs" />
     <Compile Include="Models\MediaSettingsPart.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Media/MediaResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Media/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Media/MediaResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.Media/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
index bc1e7a264..a816e3d21 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj
@@ -66,7 +66,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
-    <Compile Include="ModulesResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Commands\FeatureCommands.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/ModulesResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Modules/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Modules/ModulesResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.Modules/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
index 70a119977..016579f15 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj
@@ -66,7 +66,7 @@
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Annotations\SqlDatabaseConnectionStringAttribute.cs" />
-    <Compile Include="MultiTenancyResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Commands\TenantCommand.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Extensions\UrlHelperExtensions.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/MultiTenancyResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.MultiTenancy/MultiTenancyResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.MultiTenancy/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
index 742a4ce3c..3ad1b7e84 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
@@ -78,7 +78,7 @@
     <Compile Include="Controllers\DownloadStreamResult.cs" />
     <Compile Include="Controllers\GalleryController.cs" />
     <Compile Include="DefaultPackagingUpdater.cs" />
-    <Compile Include="PackagingResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Services\AtomExtensions.cs" />
     <Compile Include="Services\IPackageBuilder.cs" />
     <Compile Include="Services\IPackageExpander.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/PackagingResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Packaging/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Packaging/PackagingResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.Packaging/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
index 02f029572..59d239ee4 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -65,7 +65,7 @@
     <Reference Include="System.EnterpriseServices" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SearchResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Controllers\SearchController.cs" />
     <Compile Include="DataMigrations\SearchDataMigration.cs" />
     <Compile Include="Drivers\SearchSettingsPartDriver.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Search/SearchResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Search/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Search/SearchResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.Search/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
index 7a51cca2d..fb25f12f7 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj
@@ -67,7 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminMenu.cs" />
-    <Compile Include="ThemesResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="DataMigrations\ThemesDataMigration.cs" />
     <Compile Include="DesignerNotes\ZoneManagerEvents.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/ThemesResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Themes/ThemesResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.Themes/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
index c41394b34..92c94d542 100644
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj
@@ -109,7 +109,7 @@
     <Content Include="Module.txt" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="jQueryResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/jQueryResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.jQuery/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.jQuery/jQueryResourceManifest.cs
rename to src/Orchard.Web/Modules/Orchard.jQuery/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/TinyMce/TinyMceResourceManifest.cs b/src/Orchard.Web/Modules/TinyMce/ResourceManifest.cs
similarity index 100%
rename from src/Orchard.Web/Modules/TinyMce/TinyMceResourceManifest.cs
rename to src/Orchard.Web/Modules/TinyMce/ResourceManifest.cs
diff --git a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
index 546ec388c..9e5c17b6d 100644
--- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
+++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj
@@ -126,7 +126,7 @@
     <Content Include="Scripts\utils\validate.js" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TinyMceResourceManifest.cs" />
+    <Compile Include="ResourceManifest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>