diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
index 119115891..f2680f251 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
@@ -11,7 +11,7 @@ namespace Orchard.Widgets.Drivers {
 
         protected override DriverResult Editor(LayerPart layerPart, dynamic shapeHelper) {
             ContentLocation location = layerPart.GetLocation("Editor");
-            return ContentPartTemplate(layerPart, "Parts/Widgets.Layer").Location(location);
+            return ContentPartTemplate(layerPart, "Parts/Widgets.LayerPart").Location(location);
         }
 
         protected override DriverResult Editor(LayerPart layerPart, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
index 84683fa01..c6ae2d6f9 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
@@ -19,7 +19,7 @@ namespace Orchard.Widgets.Drivers {
             widgetPart.AvailableZones = _widgetsService.GetZones();
 
             ContentLocation location = widgetPart.GetLocation("Editor");
-            return ContentPartTemplate(widgetPart, "Parts/Widgets.Widget").Location(location);
+            return ContentPartTemplate(widgetPart, "Parts/Widgets.WidgetPart").Location(location);
         }
 
         protected override DriverResult Editor(WidgetPart widgetPart, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index c06df512c..39084ec68 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -114,8 +114,8 @@
     <None Include="Views\Admin\EditWidget.cshtml" />
     <None Include="Views\Admin\EditLayer.cshtml" />
     <None Include="Views\Admin\Index.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Widgets.Widget.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Widgets.Layer.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts\Widgets.WidgetPart.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts\Widgets.LayerPart.cshtml" />
     <None Include="Views\EditorTemplates\Parts\Widgets.WidgetBagPart.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.Layer.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.Layer.cshtml
rename to src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.Widget.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.Widget.cshtml
rename to src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml