diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 1569fc8a1..033f13fc2 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -252,7 +252,7 @@
     <Content Include="Reports\Views\Admin\Index.cshtml" />
     <Content Include="Routable\Module.txt" />
     <Content Include="Routable\Scripts\jquery.slugify.js" />
-    <Content Include="Routable\Views\EditorTemplates\Parts\Routable.RoutePart.cshtml" />
+    <Content Include="Routable\Views\EditorTemplates\Parts.Routable.RoutePart.cshtml" />
     <Content Include="Settings\Module.txt" />
     <Content Include="Settings\Styles\admin.css" />
     <Content Include="Settings\Views\Admin\Index.cshtml" />
@@ -337,8 +337,8 @@
     <Content Include="Contents\Views\Content.ControlWrapper.cshtml" />
     <Content Include="Contents\Views\Item\Display.cshtml" />
     <Content Include="Navigation\Placement.info" />
-    <Content Include="Routable\Views\Parts\RoutableTitle.cshtml" />
-    <Content Include="Routable\Views\Item\Display.cshtml" />
+    <Content Include="Routable\Views\Parts.RoutableTitle.cshtml" />
+    <Content Include="Routable\Views\Item.Display.cshtml" />
     <Content Include="Routable\Views\Routable.HomePage.cshtml" />
     <Content Include="Contents\Views\Items\Content.Summary.cshtml" />
     <Content Include="Shapes\Views\Pager.cshtml" />
@@ -365,8 +365,8 @@
     <Content Include="Containers\Views\EditorTemplates\Containable.cshtml" />
     <Content Include="Containers\Views\Parts\ContainerWidget.cshtml" />
     <Content Include="Containers\Views\EditorTemplates\CustomProperties.cshtml" />
-    <Content Include="Routable\Views\Parts\RoutableTitle_Summary.cshtml" />
-    <Content Include="Routable\Views\Parts\RoutableTitle_SummaryAdmin.cshtml" />
+    <Content Include="Routable\Views\Parts.RoutableTitle_Summary.cshtml" />
+    <Content Include="Routable\Views\Parts.RoutableTitle_SummaryAdmin.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Containers\Views\Parts\Container.Contained.SummaryAdmin.cshtml" />
diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs
index 012b55d6f..b9fb4bceb 100644
--- a/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs
+++ b/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs
@@ -30,7 +30,7 @@ namespace Orchard.Core.Routable.Drivers {
             T = NullLocalizer.Instance;
         }
 
-        private const string TemplateName = "Parts/Routable.RoutePart";
+        private const string TemplateName = "Parts.Routable.RoutePart";
 
         public Localizer T { get; set; }
 
diff --git a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts.Routable.RoutePart.cshtml
similarity index 100%
rename from src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
rename to src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts.Routable.RoutePart.cshtml
diff --git a/src/Orchard.Web/Core/Routable/Views/Item/Display.cshtml b/src/Orchard.Web/Core/Routable/Views/Item.Display.cshtml
similarity index 100%
rename from src/Orchard.Web/Core/Routable/Views/Item/Display.cshtml
rename to src/Orchard.Web/Core/Routable/Views/Item.Display.cshtml
diff --git a/src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle.cshtml b/src/Orchard.Web/Core/Routable/Views/Parts.RoutableTitle.cshtml
similarity index 100%
rename from src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle.cshtml
rename to src/Orchard.Web/Core/Routable/Views/Parts.RoutableTitle.cshtml
diff --git a/src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle_Summary.cshtml b/src/Orchard.Web/Core/Routable/Views/Parts.RoutableTitle_Summary.cshtml
similarity index 100%
rename from src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle_Summary.cshtml
rename to src/Orchard.Web/Core/Routable/Views/Parts.RoutableTitle_Summary.cshtml
diff --git a/src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle_SummaryAdmin.cshtml b/src/Orchard.Web/Core/Routable/Views/Parts.RoutableTitle_SummaryAdmin.cshtml
similarity index 100%
rename from src/Orchard.Web/Core/Routable/Views/Parts/RoutableTitle_SummaryAdmin.cshtml
rename to src/Orchard.Web/Core/Routable/Views/Parts.RoutableTitle_SummaryAdmin.cshtml