diff --git a/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs b/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs
index 801e14cb6..4f3d648ce 100644
--- a/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs
+++ b/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs
@@ -41,7 +41,7 @@ namespace Orchard.Core.Common.DataMigrations {
         public int UpdateFrom1() {
             ContentDefinitionManager.AlterPartDefinition(typeof(BodyPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "primary", Position = "5" }},
+                    {"Default", new ContentLocation { Zone = "Primary", Position = "5" }},
                 }));
             return 2;
         }
@@ -50,7 +50,7 @@ namespace Orchard.Core.Common.DataMigrations {
             ContentDefinitionManager.AlterPartDefinition(typeof(CommonPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
                     {"Default", new ContentLocation { Zone = "metadata", Position = "5" }},
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "20" }},
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "20" }},
                 }));
             return 3;
         }
diff --git a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
index b502eccb3..128379d55 100644
--- a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
+++ b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
@@ -19,14 +19,14 @@ namespace Orchard.Core.Common.Drivers {
         }
 
         protected override DriverResult Display(ContentPart part, TextField field, string displayType) {
-            var location = field.GetLocation(displayType, "primary", "1");
+            var location = field.GetLocation(displayType, "Primary", "1");
 
             return ContentFieldTemplate(field, TemplateName, GetPrefix(field, part))
                 .Location(location);
         }
 
         protected override DriverResult Editor(ContentPart part, TextField field) {
-            var location = field.GetLocation("Editor", "primary", "1");
+            var location = field.GetLocation("Editor", "Primary", "1");
 
             return ContentFieldTemplate(field, TemplateName, GetPrefix(field, part))
                 .Location(location);
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 cd35a776c..c3a6edaa4 100644
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml
@@ -1,6 +1,6 @@
 <div class="sections">
     <div class="primary">
-        @Display(Model.primary)
+        @Display(Model.Primary)
     </div>
     <div class="secondary">
         @Display(Model.secondary)
diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.Summary.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.Summary.cshtml
index 9f6e40964..252acbcf1 100644
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.Summary.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.Summary.cshtml
@@ -1,3 +1,3 @@
 content item -> @Model.ContentItem.ContentType
 
-@Display(Model.primary)
+@Display(Model.Primary)
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 a082c49f0..84c825aa3 100644
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
@@ -15,5 +15,5 @@
         @Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
         <br />@Display(Model.meta)
     </div>
-    <div class="primary">@Display(Model.primary)</div>
+    <div class="primary">@Display(Model.Primary)</div>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.cshtml
index a2680d729..9147b7ecb 100644
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.cshtml
@@ -3,6 +3,6 @@
 @Display(Model.Header)
     </header>
     <section>
-@Display(Model.primary)
+@Display(Model.Primary)
     </section>
 </article>
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/ContentsLocation/Settings/LocationSettingsEditorEvents.cs b/src/Orchard.Web/Core/ContentsLocation/Settings/LocationSettingsEditorEvents.cs
index 19af09230..09eed4c81 100644
--- a/src/Orchard.Web/Core/ContentsLocation/Settings/LocationSettingsEditorEvents.cs
+++ b/src/Orchard.Web/Core/ContentsLocation/Settings/LocationSettingsEditorEvents.cs
@@ -99,7 +99,7 @@ namespace Orchard.Core.ContentsLocation.Settings {
                 var viewModel = new LocationSettingsViewModel {
                     Definition = location,
                     Location = settings.Get(location.Name),
-                    DefaultLocation = new ContentLocation { Zone = "primary", Position = "1" }
+                    DefaultLocation = new ContentLocation { Zone = "Primary", Position = "1" }
                 };
                 yield return DefinitionTemplate(viewModel, templateName: "LocationSettings", prefix: location.Name);
             }
diff --git a/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs
index a52a42261..a7a2402d1 100644
--- a/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs
+++ b/src/Orchard.Web/Core/Localization/DataMigrations/LocalizationDataMigration.cs
@@ -22,8 +22,8 @@ namespace Orchard.Core.Localization.DataMigrations {
         public int UpdateFrom1() {
             ContentDefinitionManager.AlterPartDefinition(typeof(LocalizationPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "primary", Position = "5" }},
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "1" }},
+                    {"Default", new ContentLocation { Zone = "Primary", Position = "5" }},
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }},
                 }));
             return 2;
         }
diff --git a/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs b/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs
index 7789207e2..5ce6a9461 100644
--- a/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs
+++ b/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs
@@ -39,7 +39,7 @@ namespace Orchard.Core.Navigation.DataMigrations {
         public int UpdateFrom2() {
             ContentDefinitionManager.AlterPartDefinition(typeof(MenuPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "9" }}
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "9" }}
                 }));
             return 3;
         }
diff --git a/src/Orchard.Web/Core/Routable/Migrations.cs b/src/Orchard.Web/Core/Routable/Migrations.cs
index 6f1eba8a7..3a13ba07d 100644
--- a/src/Orchard.Web/Core/Routable/Migrations.cs
+++ b/src/Orchard.Web/Core/Routable/Migrations.cs
@@ -24,7 +24,7 @@ namespace Orchard.Core.Routable {
         public int UpdateFrom1() {
             ContentDefinitionManager.AlterPartDefinition(typeof(RoutePart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "before.5" }}
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "before.5" }}
                 } ));
 
             return 2;
diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
index efe54c91e..f40a7ef73 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
@@ -2,7 +2,7 @@
 @using (Html.BeginFormAntiForgeryPost()) {
 @Html.ValidationSummary()
 
-@Display(Model.primary)
+@Display(Model.Primary)
 <fieldset>
     <input class="button primaryAction" type="submit" value="@T("Save")" />
 </fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
index c0491b055..331334fbd 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
@@ -51,7 +51,7 @@ namespace Orchard.Blogs.Drivers {
                                           .Select(bp => _contentManager.BuildDisplay(bp, "SummaryAdmin.BlogPost")));
                 var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, BlogPosts: list);
                 blogPostList.Metadata.Type = "Parts_Blogs_BlogPost.List.Admin";
-                var contentShape = ContentShape(blogPostList).Location("primary");
+                var contentShape = ContentShape(blogPostList).Location("Primary");
                 driverResults.Add(contentShape);
             }
             else if (!displayType.Contains("Summary")) {
@@ -60,7 +60,7 @@ namespace Orchard.Blogs.Drivers {
                                           .Select(bp => _contentManager.BuildDisplay(bp, "Summary.BlogPost")));
                 var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, BlogPosts: list);
                 blogPostList.Metadata.Type = "Parts_Blogs_BlogPost.List";
-                var contentShape = ContentShape(blogPostList).Location("primary");
+                var contentShape = ContentShape(blogPostList).Location("Primary");
                 driverResults.Add(contentShape);
 
                 _feedManager.Register(part);
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
index abf666dd8..ff500e5c7 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
@@ -51,7 +51,7 @@ namespace Orchard.Blogs {
         public int UpdateFrom2() {
             ContentDefinitionManager.AlterPartDefinition(typeof(BlogPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "1" }}
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }}
                 }));
             return 3;
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostPart.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostPart.cs
index 8e7678190..e0f2a2137 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostPart.cs
@@ -8,11 +8,6 @@ using Orchard.Security;
 
 namespace Orchard.Blogs.Models {
     public class BlogPostPart : ContentPart {
-        [HiddenInput(DisplayValue = false)]
-        public int Id {
-            get { return ContentItem.Id; }
-        }
-
         public string Title {
             get { return this.As<RoutePart>().Title; }
             set { this.As<RoutePart>().Title = value; }
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml
index 3847f90ce..05a41787d 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Admin.Blog.cshtml
@@ -4,4 +4,4 @@
 @Display(Model.manage)
 <div class="manage"><a href="@Url.BlogPostCreate((BlogPart)Model.ContentItem.Get(typeof(BlogPart)))" class="add button primaryAction">@T("New Post")</a></div>
 @Display(Model.metadata)
-@Display(Model.primary)
\ No newline at end of file
+@Display(Model.Primary)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml
index e99cc1c67..8a70f8a90 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Blog.cshtml
@@ -7,4 +7,4 @@
 <h1>@Html.TitleForPage((string)Model.Title)</h1>
 @Display(Model.manage)
 @Display(Model.metadata)
-@Display(Model.primary)
\ No newline at end of file
+@Display(Model.Primary)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml
index 18ccbcd42..7968e4f99 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml
@@ -1,3 +1,3 @@
 <h1>@Html.TitleForPage((string)Model.Title)</h1>
 @Display(Model.metadata)
-@Display(Model.primary)
\ No newline at end of file
+@Display(Model.Primary)
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.Blog.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.Blog.cshtml
index 779a8d449..74e0ddef1 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.Blog.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.Blog.cshtml
@@ -1,4 +1,4 @@
 @Html.AddTitleParts(Model.Title)
-@Display(Model.primary)
+@Display(Model.Primary)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111 Content.Edit.Blog !!!!!!!!!!!!!!!!!!!!!!!!11
 <fieldset><input class="button primaryAction" type="submit" value="@T("Add")" /></fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml
index 0e65b0dce..530a190d0 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Edit.BlogPost.cshtml
@@ -5,7 +5,7 @@
 }
 <div class="sections">
     <div class="primary">
-@Display(Model.primary)
+@Display(Model.Primary)
     </div>
     <div class="secondary">
 @Display(Model.secondary)
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml
index f788fb89e..c4f84a8bc 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Summary.BlogPost.cshtml
@@ -5,4 +5,4 @@
 @using Orchard.Core.Common.ViewModels;
 <h2>@Html.Link((string)Model.Title, Url.BlogPost((BlogPostPart)Model.ContentItem.Get(typeof(BlogPostPart))))</h2>
 <div class="meta">@Html.PublishedState(new CommonMetadataViewModel((CommonPart)Model.ContentItem.Get(typeof(CommonPart))), T) | @Display(Model.meta)</div>
-<div class="content">@Display(Model.primary)</div>
\ No newline at end of file
+<div class="content">@Display(Model.Primary)</div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml
index e3a8ac0ba..4aaf65abc 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.SummaryAdmin.BlogPost.cshtml
@@ -18,5 +18,5 @@
         @Html.Link(T("Remove").Text, Url.Action("Remove", "Admin", new { area = "Contents", id = contentItem.Id, returnUrl }), new { itemprop = "RemoveUrl UnsafeUrl" })
         <br />@Display(Model.meta)
     </div>
-    <div class="primary">@Display(Model.primary)</div>
+    <div class="primary">@Display(Model.Primary)</div>
 </div>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
index 1b80269a7..047fecf2a 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Migrations.cs
@@ -68,11 +68,11 @@ namespace Orchard.Comments {
         public int UpdateFrom2() {
             ContentDefinitionManager.AlterPartDefinition(typeof(CommentsPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "primary", Position = "before.5" }},
-                    {"Detail", new ContentLocation { Zone = "primary", Position = "after.5" }},
+                    {"Default", new ContentLocation { Zone = "Primary", Position = "before.5" }},
+                    {"Detail", new ContentLocation { Zone = "Primary", Position = "after.5" }},
                     {"SummaryAdmin", new ContentLocation { Zone = "meta", Position = null }},
                     {"Summary", new ContentLocation { Zone = "meta", Position = "5" }},
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "10" }},
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "10" }},
                 }));
 
             ContentDefinitionManager.AlterPartDefinition(typeof(CommentsContainerPart).Name, cfg => cfg
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Models/UserSimulation.cs b/src/Orchard.Web/Modules/Orchard.Roles/Models/UserSimulation.cs
index 738dc4236..142f3a2df 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Models/UserSimulation.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Models/UserSimulation.cs
@@ -17,7 +17,6 @@ namespace Orchard.Roles.Models {
         }
 
         class SimulatedUser : ContentPart, IUser {
-            public int Id { get { return ContentItem.Id; } }
             public string UserName { get { return null; } }
             public string Email { get { return null; } }
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs
index db2d774ed..2e8e30e5f 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Migrations.cs
@@ -28,8 +28,8 @@ namespace Orchard.Tags {
         public int UpdateFrom1() {
             ContentDefinitionManager.AlterPartDefinition(typeof(TagsPart).Name, cfg => cfg
                 .WithLocation(new Dictionary<string, ContentLocation> {
-                    {"Default", new ContentLocation { Zone = "primary", Position = "49" }},
-                    {"Editor", new ContentLocation { Zone = "primary", Position = "9" }},
+                    {"Default", new ContentLocation { Zone = "Primary", Position = "49" }},
+                    {"Editor", new ContentLocation { Zone = "Primary", Position = "9" }},
                 }));
             return 2;
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
index b122b4633..3b5da18c1 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
@@ -82,21 +82,21 @@ namespace Orchard.Widgets {
             ContentDefinitionManager.AlterPartDefinition(typeof(LayerPart).Name, 
                 cfg => cfg
                     .WithLocation(new Dictionary<string, ContentLocation> {
-                        {"Editor", new ContentLocation { Zone = "primary", Position = "1" }}
+                        {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }}
                     })
                 );
 
             ContentDefinitionManager.AlterPartDefinition(typeof(WidgetPart).Name, 
                 cfg => cfg
                     .WithLocation(new Dictionary<string, ContentLocation> {
-                        {"Editor", new ContentLocation { Zone = "primary", Position = "1" }}
+                        {"Editor", new ContentLocation { Zone = "Primary", Position = "1" }}
                    })
                 );
 
             ContentDefinitionManager.AlterPartDefinition(typeof(WidgetBagPart).Name,
                 cfg => cfg
                     .WithLocation(new Dictionary<string, ContentLocation> {
-                        {"Editor", new ContentLocation {Zone = "primary", Position = "5"}}
+                        {"Editor", new ContentLocation {Zone = "Primary", Position = "5"}}
                     })
                 );
             ContentDefinitionManager.AlterTypeDefinition("WidgetPage",
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs
index 6131fe34b..a1ceb042f 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs
@@ -5,14 +5,6 @@ using Orchard.ContentManagement;
 namespace Orchard.Widgets.Models {
     public class LayerPart : ContentPart<LayerPartRecord> {
         
-        /// <summary>
-        /// The layer's identifier.
-        /// </summary>
-        [HiddenInput(DisplayValue = false)]
-        public int Id {
-            get { return ContentItem.Id; }
-        }
-        
         /// <summary>
         /// The layer's name.
         /// </summary>
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs
index 2f9a4b8e4..96f224fe6 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/WidgetPart.cs
@@ -7,14 +7,6 @@ using Orchard.ContentManagement.Aspects;
 namespace Orchard.Widgets.Models {
     public class WidgetPart : ContentPart<WidgetPartRecord> {
         
-        /// <summary>
-        /// The widget's identifier.
-        /// </summary>
-        [HiddenInput(DisplayValue = false)]
-        public int Id {
-            get { return ContentItem.Id; }
-        }
-
         /// <summary>
         /// The widget's title.
         /// </summary>
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
index b373f4783..622a2354e 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/admin.css
@@ -3,23 +3,23 @@
     font-weight:bold;
 }
 
-.availableWidgets {
+.widgets-availableWidgets {
     float: left;
     width: 35%;
 }
 
-.availableLayers {
+.widgets-availableLayers {
     float: left;
     margin: 0 0 0 2em;
     width: 45%;
 }
 
-.layerZones {
+.widgets-layerZones {
     float: left;
     width: 75%;
 }
 
-.layerZones .zone {
+.widgets-layerZones .widgets-zone {
     font-weight:700;
 	background:#f5f5f5;
 	border: 1px solid #f1f1f1;
@@ -27,7 +27,7 @@
 	margin: 0 0 1em 0;
 }
 
-.layerZones .zoneWidget {
+.widgets-layerZones .widgets-zoneWidget {
     margin: 0 0 1em 0;
     padding: 1em 2em 1em 3em;
 	background:#ffffff;
@@ -35,26 +35,26 @@
 	vertical-align: middle;
 }
 
-.layers {
+.widgets-layers {
     margin: 1em 0 0 0;
     float: left;
 }
 
-.layers ul {
+.widgets-layers ul {
 	background: #f5f5f5;
 	border: 1px solid #f1f1f1;
 }
 
-.layers .currentLayer {
+.widgets-layers .widgets-currentLayer {
 	background: #c3d9ff;
 }
 
-.layers .editLayer img {
+.widgets-layers .widgets-editLayer img {
     float: right;
     margin: 0 0 0 1em;
 }
 
-.layerZones ul li ul {
+.widgets-layerZones ul li ul {
 	margin: 0;
 	padding: 0;
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
index 7678e0e42..3f080ccea 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml
@@ -10,9 +10,9 @@
 
 	<div class="manage">@Html.ActionLink(T("Add a layer").ToString(), "AddLayer", new { }, new { @class = "button primaryAction" })</div>
 
-	<div id="widgets" class="widgets">
+	<div id="widgets">
 		
-		<div class="availableWidgets">
+		<div class="widgets-availableWidgets">
 			<h2>Available Widgets</h2>
 
 			<fieldset>
@@ -38,18 +38,18 @@
 			</fieldset>
 		</div>
 
-		<div class="availableLayers">
+		<div class="widgets-availableLayers">
 				<h2>Widget Layers</h2>
 
 			<fieldset>
-				<div class="layerZonesWidgets">
-					<ul class="layerZones">
+				<div>
+					<ul class="widgets-layerZones">
 						@foreach (string zone in Model.Zones) {
 							<li>
-								<div class="zone">@zone</div>
+								<div class="widgets-zone">@zone</div>
 								<ul>
 									@foreach (WidgetPart widget in Model.CurrentLayerWidgets.Where(widgetPart => widgetPart.Zone == zone).OrderBy(widgetPart => widgetPart.Position)) {
-										<li class="zoneWidget">
+										<li class="widgets-zoneWidget">
 											@if (widget.Position != "1") {
 												<input type="image" name="submit.MoveUp.@widget.Id" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/moveup.gif")" alt="Move up" value="@widget.Id" />
 											}
@@ -65,18 +65,18 @@
 					</ul>
 				</div>
 
-				<div class="layers">
+				<div class="widgets-layers">
 					<ul>
 						@foreach (var layer in Model.Layers) {
 							if (layer.Id == Model.CurrentLayer.Id) {
-								<li class="currentLayer editLayer">
+								<li class="widgets-currentLayer widgets-editLayer">
 									@Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
 									<a href="@Url.Action("EditLayer", new { @layer.Id })">
 										<img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
 									</a>
 								</li>
 							} else {
-								<li class="editLayer">
+								<li class="widgets-editLayer">
 									@Html.ActionLink(@layer.Name, "Index", new { @layer.Id })
 									<a href="@Url.Action("EditLayer", new { @layer.Id })">
 										<img width="15" height="15" src="@Url.Content("~/modules/orchard.widgets/Content/Admin/images/edit.gif")" />
diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml
index e99cc1c67..8a70f8a90 100644
--- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Items/Content.Blog.cshtml
@@ -7,4 +7,4 @@
 <h1>@Html.TitleForPage((string)Model.Title)</h1>
 @Display(Model.manage)
 @Display(Model.metadata)
-@Display(Model.primary)
\ No newline at end of file
+@Display(Model.Primary)
\ No newline at end of file
diff --git a/src/Orchard/ContentManagement/ContentPart.cs b/src/Orchard/ContentManagement/ContentPart.cs
index 5e071bfeb..1d7133754 100644
--- a/src/Orchard/ContentManagement/ContentPart.cs
+++ b/src/Orchard/ContentManagement/ContentPart.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Web.Mvc;
 using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentManagement.Utilities;
 using Orchard.UI;
@@ -23,6 +24,14 @@ namespace Orchard.ContentManagement {
             }
         }
 
+        /// <summary>
+        /// The ContentItem's identifier.
+        /// </summary>
+        [HiddenInput(DisplayValue = false)]
+        public int Id {
+            get { return ContentItem.Id; }
+        }
+
         public ContentTypeDefinition TypeDefinition { get { return ContentItem.TypeDefinition; } }
         public ContentTypePartDefinition TypePartDefinition { get; set; }
         public ContentPartDefinition PartDefinition { get { return TypePartDefinition.PartDefinition; } }
diff --git a/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs b/src/Orchard/ContentManagement/Handlers/TemplateFilterForRecord.cs
index d8fc8e236..d8af67dde 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 = "Primary";
             _position = "5";
         }
 
diff --git a/src/Orchard/ContentManagement/IContent.cs b/src/Orchard/ContentManagement/IContent.cs
index 729335a95..8c0d3a812 100644
--- a/src/Orchard/ContentManagement/IContent.cs
+++ b/src/Orchard/ContentManagement/IContent.cs
@@ -3,5 +3,10 @@
 namespace Orchard.ContentManagement {
     public interface IContent {
         ContentItem ContentItem { get; }
+
+        /// <summary>
+        /// The ContentItem's identifier.
+        /// </summary>
+        int Id { get; }
     }
 }