diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentSettingsPartDriver.cs
index 6a24103fa..d8161fec2 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentSettingsPartDriver.cs
@@ -15,7 +15,7 @@ namespace Orchard.Comments.Drivers {
 
         protected override DriverResult Editor(CommentSettingsPart part, dynamic shapeHelper) {
             return ContentShape("Parts_Comments_SiteSettings",
-                               () => shapeHelper.EditorTemplate(TemplateName: "Parts/Comments.SiteSettings", Model: part.Record, Prefix: Prefix));
+                               () => shapeHelper.EditorTemplate(TemplateName: "Parts.Comments.SiteSettings", Model: part.Record, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(CommentSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs
index 56861bdfb..4a7841869 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs
@@ -22,7 +22,7 @@ namespace Orchard.Comments.Drivers {
 
         protected override DriverResult Editor(CommentsPart part, dynamic shapeHelper) {
             return ContentShape("Parts_Comments_Enable",
-                                () => shapeHelper.EditorTemplate(TemplateName: "Parts/Comments.Comments", Model: part, Prefix: Prefix));
+                                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Comments.Comments", Model: part, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(CommentsPart part, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
index 489c3cd2c..5d05b1683 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
@@ -115,11 +115,11 @@
   <ItemGroup>
     <Content Include="Views\Admin\Edit.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
-    <Content Include="Views\Parts\Comments.cshtml" />
-    <Content Include="Views\Parts\Comments.Count.cshtml" />
-    <Content Include="Views\Parts\Comments.Count.SummaryAdmin.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Comments.Comments.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Comments.SiteSettings.cshtml" />
+    <Content Include="Views\Parts.Comments.cshtml" />
+    <Content Include="Views\Parts.Comments.Count.cshtml" />
+    <Content Include="Views\Parts.Comments.Count.SummaryAdmin.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts.Comments.Comments.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts.Comments.SiteSettings.cshtml" />
     <Content Include="Views\ListOfComments.cshtml" />
   </ItemGroup>
   <ItemGroup>
@@ -132,6 +132,7 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.Comments.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.Comments.cshtml
rename to src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.Comments.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts/Comments.SiteSettings.cshtml
rename to src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Count.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.Count.SummaryAdmin.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Count.SummaryAdmin.cshtml
rename to src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.Count.SummaryAdmin.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Count.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.Count.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Count.cshtml
rename to src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.Count.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml
rename to src/Orchard.Web/Modules/Orchard.Comments/Views/Parts.Comments.cshtml