diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 7c70b3738..22e3f62f8 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -180,9 +180,9 @@
     <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
     <Content Include="Themes\Classic\Views\DisplayTemplates\Items\Pages.Page.ascx" />
     <Content Include="Themes\Classic\Views\DisplayTemplates\Parts\Blogs.BlogPost.List.ascx" />
-    <Content Include="Themes\Classic\Views\footer.ascx" />
-    <Content Include="Themes\Classic\Views\layout.ascx" />
-    <Content Include="Themes\Classic\Views\menu.ascx" />
+    <Content Include="Themes\Classic\Views\_Footer.ascx" />
+    <Content Include="Themes\Classic\Views\_Layout.ascx" />
+    <Content Include="Themes\Classic\Views\_Menu.ascx" />
     <Content Include="Themes\Green\Content\Images\bodyBackground.gif" />
     <Content Include="Themes\Green\Content\Images\bodyBackground.png" />
     <Content Include="Themes\Green\Content\Images\commentpointer.gif" />
@@ -202,11 +202,11 @@
     <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
     <Content Include="Themes\Green\Views\DisplayTemplates\Items\Pages.Page.ascx" />
     <Content Include="Themes\Green\Views\DisplayTemplates\Parts\Comments.HasComments.ascx" />
-    <Content Include="Themes\Green\Views\footer.ascx" />
-    <Content Include="Themes\Green\Views\layout.ascx" />
+    <Content Include="Themes\Green\Views\_Footer.ascx" />
+    <Content Include="Themes\Green\Views\_Layout.ascx" />
     <Content Include="Themes\Green\Views\ListOfComments.ascx" />
-    <Content Include="Themes\Green\Views\menu.ascx" />
-    <Content Include="Themes\Green\Views\user.ascx" />
+    <Content Include="Themes\Green\Views\_Menu.ascx" />
+    <Content Include="Themes\Green\Views\_User.ascx" />
     <Content Include="Themes\Orange\Theme.png" />
     <Content Include="Themes\Orange\Views\Orchard.Blogs\BlogPost\Item.ascx" />
     <Content Include="Themes\Orchard\Content\Images\background_content.jpg" />
@@ -218,9 +218,9 @@
     <Content Include="Themes\Orchard\Styles\site.css" />
     <Content Include="Themes\Orchard\Theme.png" />
     <Content Include="Themes\Orchard\Theme.txt" />
-    <Content Include="Themes\Orchard\Views\footer.ascx" />
-    <Content Include="Themes\Orchard\Views\layout.ascx" />
-    <Content Include="Themes\Orchard\Views\menu.ascx" />
+    <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" />
diff --git a/src/Orchard.Web/Themes/Classic/Views/footer.ascx b/src/Orchard.Web/Themes/Classic/Views/_Footer.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/Classic/Views/footer.ascx
rename to src/Orchard.Web/Themes/Classic/Views/_Footer.ascx
diff --git a/src/Orchard.Web/Themes/Classic/Views/layout.ascx b/src/Orchard.Web/Themes/Classic/Views/_Layout.ascx
similarity index 90%
rename from src/Orchard.Web/Themes/Classic/Views/layout.ascx
rename to src/Orchard.Web/Themes/Classic/Views/_Layout.ascx
index cedb0196e..1baba67a0 100644
--- a/src/Orchard.Web/Themes/Classic/Views/layout.ascx
+++ b/src/Orchard.Web/Themes/Classic/Views/_Layout.ascx
@@ -12,7 +12,7 @@
     <div id="header">
             <h1><%=Html.Encode(Html.SiteName()) %></h1>
         <%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>
-        <% Html.Include("user"); %>
+        <% Html.Include("User"); %>
     </div>
     <div id="main">
         <div id="content">
@@ -35,6 +35,6 @@
         </div>
         <%-- End Content --%>
         <%Html.Zone("footer");%>
-        <% Html.Include("footer"); %>
+        <% Html.Include("Footer"); %>
     </div>
 </div>
diff --git a/src/Orchard.Web/Themes/Classic/Views/menu.ascx b/src/Orchard.Web/Themes/Classic/Views/_Menu.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/Classic/Views/menu.ascx
rename to src/Orchard.Web/Themes/Classic/Views/_Menu.ascx
diff --git a/src/Orchard.Web/Themes/Green/Views/footer.ascx b/src/Orchard.Web/Themes/Green/Views/_Footer.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/Green/Views/footer.ascx
rename to src/Orchard.Web/Themes/Green/Views/_Footer.ascx
diff --git a/src/Orchard.Web/Themes/Green/Views/layout.ascx b/src/Orchard.Web/Themes/Green/Views/_Layout.ascx
similarity index 93%
rename from src/Orchard.Web/Themes/Green/Views/layout.ascx
rename to src/Orchard.Web/Themes/Green/Views/_Layout.ascx
index c26546e54..380d685c3 100644
--- a/src/Orchard.Web/Themes/Green/Views/layout.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/_Layout.ascx
@@ -20,13 +20,13 @@
         <div class="yui-u">
             <div id="logIn">
                 <%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>
-                <% Html.Include("user"); %>
+                <% Html.Include("User"); %>
             </div>
         </div>
     </div>
     <%--Top Navigation--%>
     <%-- todo:(nheskew) this will need to be a generated menu --%>
-    <% Html.Include("menu"); %>
+    <% Html.Include("Menu"); %>
 </div>
 
 <%-- Begin Page Content --%>
@@ -53,5 +53,5 @@
   </div>
   <%-- End Content --%>
   <%Html.Zone("footer");%>
-  <% Html.Include("footer"); %>
+  <% Html.Include("Footer"); %>
 </div>
diff --git a/src/Orchard.Web/Themes/Green/Views/menu.ascx b/src/Orchard.Web/Themes/Green/Views/_Menu.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/Green/Views/menu.ascx
rename to src/Orchard.Web/Themes/Green/Views/_Menu.ascx
diff --git a/src/Orchard.Web/Themes/Green/Views/user.ascx b/src/Orchard.Web/Themes/Green/Views/_User.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/Green/Views/user.ascx
rename to src/Orchard.Web/Themes/Green/Views/_User.ascx
diff --git a/src/Orchard.Web/Themes/Orchard/Views/footer.ascx b/src/Orchard.Web/Themes/Orchard/Views/_Footer.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/Orchard/Views/footer.ascx
rename to src/Orchard.Web/Themes/Orchard/Views/_Footer.ascx
diff --git a/src/Orchard.Web/Themes/Orchard/Views/layout.ascx b/src/Orchard.Web/Themes/Orchard/Views/_Layout.ascx
similarity index 94%
rename from src/Orchard.Web/Themes/Orchard/Views/layout.ascx
rename to src/Orchard.Web/Themes/Orchard/Views/_Layout.ascx
index e2678afed..d72fd7f2a 100644
--- a/src/Orchard.Web/Themes/Orchard/Views/layout.ascx
+++ b/src/Orchard.Web/Themes/Orchard/Views/_Layout.ascx
@@ -7,11 +7,11 @@
         <h1>
             <a href="/"><span class="displayText">Project Orchard</span></a></h1>
         <%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>
-        <% Html.Include("user"); %>
+        <% Html.Include("User"); %>
     </div>
     <%--Top Navigation--%>
     <%-- todo:(nheskew) this will need to be a generated menu --%>
-    <% Html.Include("menu"); %>
+    <% Html.Include("Menu"); %>
     <div id="content" class="clearLayout">
         <ol id="contentMain">
             <li class="moduleContentMain">
@@ -49,5 +49,5 @@
     </div>
     <%-- End Content --%>
     <%Html.Zone("footer");%>
-    <% Html.Include("footer"); %>
+    <% Html.Include("Footer"); %>
 </div>
diff --git a/src/Orchard.Web/Themes/Orchard/Views/menu.ascx b/src/Orchard.Web/Themes/Orchard/Views/_Menu.ascx
similarity index 100%
rename from src/Orchard.Web/Themes/Orchard/Views/menu.ascx
rename to src/Orchard.Web/Themes/Orchard/Views/_Menu.ascx