diff --git a/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
index 8caeca402..9cc8433f4 100644
--- a/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
+++ b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
@@ -158,7 +158,7 @@ namespace Orchard.Core.Common.Handlers {
         //    if (instance.Owner != null)
         //        viewModel.Owner = instance.Owner.UserName;
 
-        //    context.AddEditor(new TemplateViewModel(viewModel, "CommonPart") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" });
+        //    context.AddEditor(new TemplateViewModel(viewModel, "CommonPart") { TemplateName = "Parts/Common.Owner", ZoneName = "Content", Position = "999" });
         //}
 
 
@@ -190,7 +190,7 @@ namespace Orchard.Core.Common.Handlers {
         //        }
         //    }
 
-        //    context.AddEditor(new TemplateViewModel(viewModel, "CommonPart") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" });
+        //    context.AddEditor(new TemplateViewModel(viewModel, "CommonPart") { TemplateName = "Parts/Common.Owner", ZoneName = "Content", Position = "999" });
         //}
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Common/Placement.info b/src/Orchard.Web/Core/Common/Placement.info
index c9796ff46..bffa8434f 100644
--- a/src/Orchard.Web/Core/Common/Placement.info
+++ b/src/Orchard.Web/Core/Common/Placement.info
@@ -10,10 +10,10 @@
     -->
     <!-- edit shapes getting default placements -->
     <!-- edit "shape" -->
-    <Place Parts_Common_Body_Edit="Primary:2"/>
-    <Place Parts_Common_Owner_Edit="Primary:20"/>
-    <Place Parts_Common_Container_Edit="Primary:20"/>
-    <Place Fields_Common_Text_Edit="Primary:2.5"/>
+    <Place Parts_Common_Body_Edit="Content:2"/>
+    <Place Parts_Common_Owner_Edit="Content:20"/>
+    <Place Parts_Common_Container_Edit="Content:20"/>
+    <Place Fields_Common_Text_Edit="Content:2.5"/>
     <!-- default positioning -->
     <!-- show summary for all DisplayType by default -->
     <Place Parts_Common_Body_Summary="Content:5"/>
@@ -22,7 +22,8 @@
     <Match DisplayType="Detail">
         <!-- hide summary, show full content, for Detail -->
         <Place Parts_Common_Body_Summary="-"
-               Parts_Common_Body="Content:5" />
+               Parts_Common_Body="Content:5"
+               Parts_Common_Metadata="Meta:2"/>
     </Match>
     <Match DisplayType="Summary">
         <Place Parts_Common_Metadata_Summary="Meta:2"/>
diff --git a/src/Orchard.Web/Core/Contents/Placement.info b/src/Orchard.Web/Core/Contents/Placement.info
index 53412fcdb..8cc668cba 100644
--- a/src/Orchard.Web/Core/Contents/Placement.info
+++ b/src/Orchard.Web/Core/Contents/Placement.info
@@ -8,6 +8,6 @@
         <Place Parts_Contents_Publish="Content:5"/>
     </Match>
     <Match DisplayType="SummaryAdmin">
-        <Place Parts_Contents_Publish_SummaryAdmin="Secondary:5"/>
+        <Place Parts_Contents_Publish_SummaryAdmin="Actions:5"/>
     </Match>
 </Placement>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
index 40941f429..e0f0cd87b 100644
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
@@ -1,9 +1,10 @@
 <div class="sections">
     <div class="primary">
-        @Display(Model.Primary)
+        @Display(Model.Content)
     </div>
     <div class="secondary">
-        @Display(Model.Secondary)
+        @Display(Model.Sidebar)
+        @* todo: (heskew) remove when the CommonPart is adding the save button *@
         <fieldset>
             <button class="primaryAction" type="submit" name="submit.Save" value="submit.Save">@T("Save")</button>
         </fieldset>
diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
index 82ed945da..ed4c16944 100644
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
@@ -8,11 +8,19 @@
     <div class="properties">
         <input type="checkbox" value="@contentItem.Id" name="itemIds"/>
         <h3>@Html.ItemEditLink(contentItem)</h3>
+        @if (Model.Header != null) {
+        <div class="header">@Display(Model.Header)</div>
+        }
+        @if (Model.Meta != null) {
         <div class="metadata">@Display(Model.Meta)</div>
+        }
     </div>
-    <div class="related">@Display(Model.Secondary)
+    <div class="related">
+        @Display(Model.Actions)
         @Html.ItemEditLink(T("Edit").Text, contentItem) @T(" | ")
         @Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
     </div>
-    <div class="primary">@Display(Model.Primary)</div>
+    @if (Model.Content != null) {
+    <div class="primary">@Display(Model.Content)</div>
+    }
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Localization/Placement.info b/src/Orchard.Web/Core/Localization/Placement.info
index 0aa40e044..d06608e6c 100644
--- a/src/Orchard.Web/Core/Localization/Placement.info
+++ b/src/Orchard.Web/Core/Localization/Placement.info
@@ -6,7 +6,7 @@
         Parts_Localization_ContentTranslations_SummaryAdmin
     -->
     <!-- edit shape just gets default placement -->
-    <Place Parts_Localization_ContentTranslations_Edit="Primary:before.1"/>
+    <Place Parts_Localization_ContentTranslations_Edit="Content:before.1"/>
     <Match DisplayType="Detail">
         <Place Parts_Localization_ContentTranslations="Content:2"/>
     </Match>
@@ -14,6 +14,6 @@
         <Place Parts_Localization_ContentTranslations_Summary="Content:2"/>
     </Match>
     <Match DisplayType="SummaryAdmin">
-        <Place Parts_Localization_ContentTranslations_SummaryAdmin="Primary:5"/>
+        <Place Parts_Localization_ContentTranslations_SummaryAdmin="Content:5"/>
     </Match>
 </Placement>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml
index 31480af52..dadf0826d 100644
--- a/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml
+++ b/src/Orchard.Web/Core/Localization/Views/Admin/Translate.cshtml
@@ -2,7 +2,7 @@
 @using Orchard.Core.Localization.ViewModels;
 @{
     dynamic content = Model.Content;
-    content.Zones.Primary.Add(New.Partial(TemplateName: "CultureSelection", Model: Model), "0");
+    content.Zones.Content.Add(New.Partial(TemplateName: "CultureSelection", Model: Model), "0");
 }
 <h1>@Html.TitleForPage(T("Translate Content").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
diff --git a/src/Orchard.Web/Core/Messaging/Placement.info b/src/Orchard.Web/Core/Messaging/Placement.info
index 35c14f610..9bce6bf11 100644
--- a/src/Orchard.Web/Core/Messaging/Placement.info
+++ b/src/Orchard.Web/Core/Messaging/Placement.info
@@ -1,3 +1,3 @@
 <Placement>
-    <Place Parts_MessageSettings_Edit="Primary:10"/>
+    <Place Parts_MessageSettings_Edit="Content:10"/>
 </Placement>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Navigation/Placement.info b/src/Orchard.Web/Core/Navigation/Placement.info
index a44150bda..5b48f3af6 100644
--- a/src/Orchard.Web/Core/Navigation/Placement.info
+++ b/src/Orchard.Web/Core/Navigation/Placement.info
@@ -1,3 +1,3 @@
 <Placement>
-    <Place Parts_Navigation_Menu_Edit="Primary:9"/>
+    <Place Parts_Navigation_Menu_Edit="Content:9"/>
 </Placement>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Routable/Placement.info b/src/Orchard.Web/Core/Routable/Placement.info
index 348c88027..6dc1507d4 100644
--- a/src/Orchard.Web/Core/Routable/Placement.info
+++ b/src/Orchard.Web/Core/Routable/Placement.info
@@ -1,4 +1,9 @@
 <Placement>
-    <Place Parts_RoutableTitle="Header:5"/>
-    <Place Parts_Routable_Edit="Primary:before.5"/>
+    <Place Parts_Routable_Edit="Content:before.5"/>
+    <Match DisplayType="Detail">
+        <Place Parts_RoutableTitle="Header:5"/>
+    </Match>
+    <Match DisplayType="Summary">
+        <Place Parts_RoutableTitle="Header:5"/>
+    </Match>
 </Placement>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Settings/Placement.info b/src/Orchard.Web/Core/Settings/Placement.info
index 729be5f73..4e7d3370c 100644
--- a/src/Orchard.Web/Core/Settings/Placement.info
+++ b/src/Orchard.Web/Core/Settings/Placement.info
@@ -1,3 +1,3 @@
 <Placement>
-    <Place Parts_Settings_SiteSettingsPart="Primary:1"/>
+    <Place Parts_Settings_SiteSettingsPart="Content:1"/>
 </Placement>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
index f40a7ef73..a83d7786c 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
@@ -1,10 +1,9 @@
 <h1>@Html.TitleForPage(T("Manage Settings").ToString())</h1>
 @using (Html.BeginFormAntiForgeryPost()) {
-@Html.ValidationSummary()
-
-@Display(Model.Primary)
-<fieldset>
-    <input class="button primaryAction" type="submit" value="@T("Save")" />
-</fieldset>
+    @Html.ValidationSummary()
+    @Display(Model.Content)
+    <fieldset>
+        <input class="button primaryAction" type="submit" value="@T("Save")" />
+    </fieldset>
 }
 
diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Placement.info b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Placement.info
index 7c693ebfe..f9bbb84d6 100644
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Placement.info
@@ -1,6 +1,6 @@
 <Placement>
+    <Place Parts_ArchiveLater_Edit="Sidebar:2"/>
     <Match DisplayType="SummaryAdmin">
         <Place Parts_ArchiveLater_Metadata_SummaryAdmin="Meta:2"/>
     </Match>
-    <Place Parts_ArchiveLater_Edit="Secondary:2"/>
 </Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index 352e3d191..7983253bb 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -163,7 +163,6 @@
     <Content Include="Views\Items\Content-Blog.DetailAdmin.cshtml" />
     <Content Include="Views\Items\Content-Blog.Edit.cshtml" />
     <Content Include="Views\Items\Content-BlogPost.Editor.cshtml" />
-    <Content Include="Views\Items\Content-BlogPost.SummaryAdmin.cshtml" />
     <Content Include="Views\Parts\Blogs.BlogPost.List.cshtml" />
     <Content Include="Views\Parts\Blogs.Blog.Pager.cshtml" />
     <Content Include="Views\Parts\Blogs.RecentBlogPosts.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info b/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info
index 2c107e4fb..4846f30f5 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info
@@ -10,9 +10,9 @@
     -->
     <!-- widget and edit shapes just get default placement -->
     <!-- edit "shapes" -->
-    <Place Parts_Blogs_Blog_Fields="Primary:2"/>
-    <Place Parts_Blogs_BlogArchives_Edit="Primary:5"/>
-    <Place Parts_Blogs_RecentBlogPosts_Edit="Primary:5"/>
+    <Place Parts_Blogs_Blog_Fields="Content:2"/>
+    <Place Parts_Blogs_BlogArchives_Edit="Content:5"/>
+    <Place Parts_Blogs_RecentBlogPosts_Edit="Content:5"/>
     <!-- widgets -->
     <Place Parts_Blogs_BlogArchives="Content"/>
     <Place Parts_Blogs_RecentBlogPosts="Content"/>
@@ -29,8 +29,8 @@
         </Match>
         <Match DisplayType="DetailAdmin">
             <Place Parts_Blogs_BlogPost_List_Admin="Content:5"
-                   Parts_Blogs_Blog_Manage="Manage"
-                   Parts_Blogs_Blog_Description="Manage:after"/>
+                   Parts_Blogs_Blog_Manage="Actions"
+                   Parts_Blogs_Blog_Description="Actions:after"/>
         </Match>
         <Match DisplayType="Summary">
             <Place Parts_Blogs_Blog_Description="Content:before"
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.DetailAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.DetailAdmin.cshtml
index 90868b616..83169a11b 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.DetailAdmin.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.DetailAdmin.cshtml
@@ -1,6 +1,7 @@
 @using Orchard.Blogs.Extensions;
 @using Orchard.Blogs.Models;
 <h1><a href="@Url.BlogForAdmin((string)Model.Slug)">@Html.TitleForPage((string)Model.Title)</a></h1>
-@Display(Model.Manage)
+@Display(Model.Header)
+@Display(Model.Actions)
 <div class="manage"><a href="@Url.BlogPostCreate((BlogPart)Model.ContentItem.Get(typeof(BlogPart)))" class="add button primaryAction">@T("New Post")</a></div>
 @Display(Model.Content)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml
index b18f344b7..92f5bf5b8 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml
@@ -2,6 +2,13 @@
 @{
     Html.AddTitleParts((string)Model.Title);
 }
-@Display(Model.Primary)
-@Display(Model.Secondary)
-<fieldset><button class="primaryAction" type="submit">@T("Save")</button></fieldset>
\ No newline at end of file
+<div class="sections">
+    <div class="primary">
+        @Display(Model.Content)
+    </div>
+    <div class="secondary">
+        @Display(Model.Sidebar)
+        @* todo: (heskew) remove when the CommonPart is adding the save button *@
+        <fieldset><button class="primaryAction" type="submit">@T("Save")</button></fieldset>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.SummaryAdmin.cshtml
index 25ccabfd3..63bce04f0 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.SummaryAdmin.cshtml
@@ -10,18 +10,20 @@
     <div class="properties">
         <input type="checkbox" value="@contentItem.Id" name="itemIds"/>
         <h3>@Html.Link((string)Model.Title, Url.BlogForAdmin((string)Model.Slug))</h3>
+        @if (Model.Header != null) {
+        <div class="header">@Display(Model.Header)</div>
+        }
         @if (Model.Meta != null) {
         <div class="metadata">@Display(Model.Meta)</div>
         }
-        @* <p>[list of authors] [modify blog access]</p> *@
     </div>
     <div class="related">
+        @Display(Model.Actions)
         <a href="@Url.Blog((string)Model.Slug)" title="@T("View")">@T("View")</a>@T(" | ")
         <a href="@Url.BlogForAdmin((string)Model.Slug)" title="@T("List Posts")">@T("List Posts")</a>@T(" | ")
         <a href="@Url.BlogPostCreate((BlogPart)Model.ContentItem.Get(typeof(BlogPart)))" title="@T("New Post")">@T("New Post")</a>@T(" | ")
         <a href="@Url.BlogEdit((string)Model.Slug)" title="@T("Edit")">@T("Edit")</a>@T(" | ")
-        <a href="Url.BlogRemove((string)Model.Slug)" title="@T("Remove")" itemprop="RemoveUrl UnsafeUrl">@T("Remove")</a>
-        <br />@Display(Model.Secondary)
+        <a href="@Url.BlogRemove((string)Model.Slug)" title="@T("Remove")" itemprop="RemoveUrl UnsafeUrl">@T("Remove")</a>
     </div>
     @if (Model.Content != null) {
     <div class="primary">@Display(Model.Content)</div>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml
index fe43401f1..a73373f4f 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml
@@ -1,3 +1,5 @@
+@* todo: (heskew) remove - not being used but keeping around for the "remove draft" reminder *@
+
 @using Orchard.Blogs.Models;
 @{
     Html.AddTitleParts((string)Model.Title);
@@ -5,10 +7,11 @@
 }
 <div class="sections">
     <div class="primary">
-@Display(Model.Primary)
+        @Display(Model.Content)
     </div>
     <div class="secondary">
-@Display(Model.Secondary)
+        @Display(Model.Sidebar)
+        @* todo: (heskew) remove when the CommonPart is adding the save button - also move the remove draft functionality to the CommonPart at that time *@
         <fieldset>
             <button class="primaryAction" type="submit" name="submit.Save">@T("Save")</button>
             @* TODO: (erikpo) In the future, remove the HasPublished check so the user can delete the content item from here if the choose to *@
@@ -17,4 +20,4 @@
             }
         </fieldset>
     </div>
-</div>
\ No newline at end of file
+</div>asdfsdaf
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.SummaryAdmin.cshtml
deleted file mode 100644
index a3d32962b..000000000
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.SummaryAdmin.cshtml
+++ /dev/null
@@ -1,21 +0,0 @@
-@using Orchard.Blogs.Extensions;
-@using Orchard.Blogs.Models;
-@using Orchard.ContentManagement;
-@using Orchard.Utility.Extensions;
-@{
-	ContentItem contentItem = Model.ContentItem;
-	var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
-}
-<div class="summary" itemscope="itemscope" itemid="@contentItem.Id" itemtype="http://orchardproject.net/data/ContentItem">
-    <div class="properties">
-        <input type="checkbox" value="@contentItem.Id" name="itemIds"/>
-        <h3>@Html.Link((string)Model.Title, Url.BlogPostEdit((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))</h3>
-        <div class="metadata">@Display(Model.Meta)</div>
-    </div>
-    <div class="related">@Display(Model.Related)
-        @Html.Link(T("Edit").Text, Url.BlogPostEdit((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart)))) @T(" | ")
-        @Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })@T(" | ")
-        @Display(Model.Secondary)
-    </div>
-    <div class="primary">@Display(Model.Content)</div>
-</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Placement.info b/src/Orchard.Web/Modules/Orchard.Comments/Placement.info
index 1aea86c77..e0fc46077 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Placement.info
@@ -7,8 +7,8 @@
     -->
     <!-- widget and edit shapes just get default placement -->
     <!-- edit "shapes" -->
-    <Place Parts_Comments_Enable="Primary:10"/>
-    <Place Parts_Comments_SiteSettings="Primary:10"/>
+    <Place Parts_Comments_Enable="Content:10"/>
+    <Place Parts_Comments_SiteSettings="Content:10"/>
     <Match DisplayType="Detail">
         <Place Parts_Comments="Content:10" />
     </Match>
@@ -16,6 +16,6 @@
         <Place Parts_Comments_Count="Meta:5"/>
     </Match>
     <Match DisplayType="SummaryAdmin">
-        <Place Parts_Comments_Count_SummaryAdmin="Secondary"/>
+        <Place Parts_Comments_Count_SummaryAdmin="Sidebar"/>
     </Match>
 </Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentQueries/Placement.info b/src/Orchard.Web/Modules/Orchard.ContentQueries/Placement.info
index f9dfe0571..d3b3fb52b 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentQueries/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.ContentQueries/Placement.info
@@ -4,7 +4,7 @@
         Parts_QueriedContents
     -->
     <!-- edit "shape" -->
-    <Place Parts_ContentQueries_Configuration="Primary:2"/>
+    <Place Parts_ContentQueries_Configuration="Content:2"/>
     <!-- default positioning -->
     <Match ContentType="ContentQuery">
         <Match DisplayType="Detail">
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Placement.info b/src/Orchard.Web/Modules/Orchard.Email/Placement.info
index 7f3cf4de5..847ddf0b4 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Email/Placement.info
@@ -1,3 +1,3 @@
 <Placement>
-  <Place Parts_SmtpSettings_Edit="Primary:10"/>
+  <Place Parts_SmtpSettings_Edit="Content:10"/>
 </Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info b/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info
index 98d424a6e..f321cd6a5 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info
@@ -7,7 +7,7 @@
     -->
     <!-- edit shape just get default placement -->
     <!-- edit "shape" -->
-    <Place Parts_PublishLater_Edit="Secondary:1"/>
+    <Place Parts_PublishLater_Edit="Sidebar:1"/>
     <!-- default positioning -->
     <Match DisplayType="SummaryAdmin">
         <Place Parts_PublishLater_Metadata_SummaryAdmin="Meta:1"/>
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Placement.info b/src/Orchard.Web/Modules/Orchard.Roles/Placement.info
index bb38e975a..ece7d7ecb 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Placement.info
@@ -1,3 +1,3 @@
 <Placement>
-    <Place Parts_Roles_UserRoles_Edit="Primary:10"/>
+    <Place Parts_Roles_UserRoles_Edit="Content:10"/>
 </Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Placement.info b/src/Orchard.Web/Modules/Orchard.Search/Placement.info
index e0cc312db..c43801cdd 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Search/Placement.info
@@ -1,3 +1,3 @@
 <Placement>
-    <Place Parts_Search_SiteSettings="Primary:1"/>
+    <Place Parts_Search_SiteSettings="Content:1"/>
 </Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Placement.info b/src/Orchard.Web/Modules/Orchard.Tags/Placement.info
index 8a465c8fa..c528accb2 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Placement.info
@@ -1,4 +1,9 @@
 <Placement>
-  <Place Parts_Tags_ShowTags="Header:after.7"/>
-  <Place Parts_Tags_Edit="Primary:7"/>
+    <Place Parts_Tags_Edit="Content:7"/>
+    <Match DisplayType="Detail">
+        <Place Parts_Tags_ShowTags="Header:after.7"/>
+    </Match>
+    <Match DisplayType="Summary">
+        <Place Parts_Tags_ShowTags="Header:after.7"/>
+    </Match>
 </Placement>
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
index cda4b0243..af834ed7e 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
@@ -1,8 +1,8 @@
 <div class="sections">
     <div class="primary">
-      @Display(Model.Primary)
+        @Display(Model.Content)
     </div>
     <div class="secondary">
-        @Display(Model.Secondary)
+        @Display(Model.Sidebar)
     </div>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Placement.info b/src/Orchard.Web/Modules/Orchard.Widgets/Placement.info
index 174ee3b11..9ab08b4dd 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Placement.info
@@ -1,5 +1,5 @@
 <Placement>
-    <Place Parts_Widgets_LayerPart="Primary:1"/>
-    <Place Parts_Widgets_WidgetPart="Primary:1"/>
-    <Place Parts_Widgets_WidegetBagPart="Primary:5"/>
+    <Place Parts_Widgets_LayerPart="Content:1"/>
+    <Place Parts_Widgets_WidgetPart="Content:1"/>
+    <Place Parts_Widgets_WidegetBagPart="Content:5"/>
 </Placement>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml
index 45769c4cf..696503b21 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml
@@ -1,9 +1,10 @@
 <div class="sections">
     <div class="primary">
-        @Display(Model.Primary)
+        @Display(Model.Content)
     </div>
     <div class="secondary">
-        @Display(Model.Secondary)
+        @Display(Model.Sidebar)
+        @* todo: (heskew) remove when the CommonPart is adding the save button *@
         <fieldset>
             <input class="button primaryAction" type="submit" name="submit.Save" value="@T("Save")"/>
         </fieldset>
diff --git a/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs b/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs
index d8af67dde..1a46c7e7e 100644
--- a/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs
+++ b/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs
@@ -10,7 +10,7 @@ namespace Orchard.ContentManagement.Handlers {
         public TemplateFilterForRecord(string prefix, string templateName) {
             _prefix = prefix;
             _templateName = templateName;
-            _location = "Primary";
+            _location = "Content";
             _position = "5";
         }