diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index 0108e336e..3ffbe1f77 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -183,14 +183,14 @@
     <Content Include="Themes\Theme.txt" />
     <Content Include="Themes\Styles\site.css" />
     <Content Include="Themes\Views\Admin\Install.aspx" />
-    <Content Include="Themes\Views\_Header.ascx" />
-    <Content Include="Themes\Views\_Document.aspx" />
+    <Content Include="Themes\Views\Header.ascx" />
+    <Content Include="Themes\Views\Document.aspx" />
     <Content Include="Themes\Views\EditorTemplates\Parts\Themes.SiteSettings.ascx" />
     <Content Include="Themes\Views\HeadPreload.ascx" />
-    <Content Include="Themes\Views\_Layout.ascx" />
-    <Content Include="Themes\Views\_Messages.ascx" />
-    <Content Include="Themes\Views\_User.ascx" />
-    <Content Include="Themes\Views\_Menu.ascx" />
+    <Content Include="Themes\Views\Layout.ascx" />
+    <Content Include="Themes\Views\Messages.ascx" />
+    <Content Include="Themes\Views\User.ascx" />
+    <Content Include="Themes\Views\Menu.ascx" />
     <Content Include="Themes\Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Core/Themes/Views/_Document.aspx b/src/Orchard.Web/Core/Themes/Views/Document.aspx
similarity index 100%
rename from src/Orchard.Web/Core/Themes/Views/_Document.aspx
rename to src/Orchard.Web/Core/Themes/Views/Document.aspx
diff --git a/src/Orchard.Web/Core/Themes/Views/_Header.ascx b/src/Orchard.Web/Core/Themes/Views/Header.ascx
similarity index 100%
rename from src/Orchard.Web/Core/Themes/Views/_Header.ascx
rename to src/Orchard.Web/Core/Themes/Views/Header.ascx
diff --git a/src/Orchard.Web/Core/Themes/Views/_Layout.ascx b/src/Orchard.Web/Core/Themes/Views/Layout.ascx
similarity index 100%
rename from src/Orchard.Web/Core/Themes/Views/_Layout.ascx
rename to src/Orchard.Web/Core/Themes/Views/Layout.ascx
diff --git a/src/Orchard.Web/Core/Themes/Views/_Menu.ascx b/src/Orchard.Web/Core/Themes/Views/Menu.ascx
similarity index 100%
rename from src/Orchard.Web/Core/Themes/Views/_Menu.ascx
rename to src/Orchard.Web/Core/Themes/Views/Menu.ascx
diff --git a/src/Orchard.Web/Core/Themes/Views/_Messages.ascx b/src/Orchard.Web/Core/Themes/Views/Messages.ascx
similarity index 100%
rename from src/Orchard.Web/Core/Themes/Views/_Messages.ascx
rename to src/Orchard.Web/Core/Themes/Views/Messages.ascx
diff --git a/src/Orchard.Web/Core/Themes/Views/_User.ascx b/src/Orchard.Web/Core/Themes/Views/User.ascx
similarity index 100%
rename from src/Orchard.Web/Core/Themes/Views/_User.ascx
rename to src/Orchard.Web/Core/Themes/Views/User.ascx
diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 7d9f4294e..7c70b3738 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -149,7 +149,7 @@
     <Content Include="Config\Diagnostics.config" />
     <Content Include="Themes\Orange\Styles\site.css" />
     <Content Include="Themes\Orange\Theme.txt" />
-    <Content Include="Themes\Orange\Views\_Layout.ascx" />
+    <Content Include="Themes\Orange\Views\Layout.ascx" />
     <Content Include="Themes\TheAdmin\Styles\images\background_header.jpg" />
     <Content Include="Themes\TheAdmin\Styles\images\icons.png" />
     <Content Include="Themes\TheAdmin\Styles\images\orchardLogo.jpg" />
@@ -158,7 +158,7 @@
     <Content Include="Themes\TheAdmin\Styles\site.css" />
     <Content Include="Themes\TheAdmin\Theme.gif" />
     <Content Include="Themes\TheAdmin\Theme.txt" />
-    <Content Include="Themes\TheAdmin\Views\_Layout.ascx" />
+    <Content Include="Themes\TheAdmin\Views\Layout.ascx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Themes\TheAdmin\Styles\images\icons.psd" />
@@ -221,9 +221,9 @@
     <Content Include="Themes\Orchard\Views\footer.ascx" />
     <Content Include="Themes\Orchard\Views\layout.ascx" />
     <Content Include="Themes\Orchard\Views\menu.ascx" />
-    <Content Include="Themes\TheAdmin\Views\_Menu.ascx" />
-    <Content Include="Themes\TheAdmin\Views\_User.ascx" />
-    <Content Include="Themes\TheAdmin\Views\_Header.ascx" />
+    <Content Include="Themes\TheAdmin\Views\Menu.ascx" />
+    <Content Include="Themes\TheAdmin\Views\User.ascx" />
+    <Content Include="Themes\TheAdmin\Views\Header.ascx" />
     <Content Include="Themes\Web.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Orchard.Web/Themes/Orange/Views/_Layout.ascx b/src/Orchard.Web/Themes/Orange/Views/Layout.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/Orange/Views/_Layout.ascx
rename to src/Orchard.Web/Themes/Orange/Views/Layout.ascx
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/_Header.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/Header.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/TheAdmin/Views/_Header.ascx
rename to src/Orchard.Web/Themes/TheAdmin/Views/Header.ascx
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/_Layout.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/TheAdmin/Views/_Layout.ascx
rename to src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/_Menu.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/TheAdmin/Views/_Menu.ascx
rename to src/Orchard.Web/Themes/TheAdmin/Views/Menu.ascx
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/_User.ascx b/src/Orchard.Web/Themes/TheAdmin/Views/User.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/TheAdmin/Views/_User.ascx
rename to src/Orchard.Web/Themes/TheAdmin/Views/User.ascx