diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs
index 4c5643095..25dadf3e5 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs
@@ -51,7 +51,7 @@ namespace Orchard.Blogs.Controllers {
             if (postPart == null)
                 return new NotFoundResult();
 
-            var model = _services.ContentManager.BuildDisplay(postPart, "BlogPost");
+            var model = _services.ContentManager.BuildDisplay(postPart, "Detail.BlogPost");
 
             return View(model);
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index 356717ef7..6babf2c8f 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -132,7 +132,7 @@
     </Content>
     <Content Include="Views\Items\Content.Admin.Blog.cshtml" />
     <Content Include="Views\Items\Content.Blog.cshtml" />
-    <Content Include="Views\Items\Content.BlogPost.cshtml" />
+    <Content Include="Views\Items\Content.Detail.BlogPost.cshtml" />
     <Content Include="Views\Items\Content.Edit.Blog.cshtml">
       <SubType>Code</SubType>
     </Content>
@@ -167,19 +167,19 @@
     <Content Include="Views\Parts\Tags.ShowTags.Summary.BlogPost.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Parts\PublishLater.Metadata.BlogPost.cshtml" />
+    <Content Include="Views\Parts\PublishLater.Metadata.Detail.BlogPost.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Parts\Common.Metadata.BlogPost.cshtml" />
+    <Content Include="Views\Parts\Common.Metadata.Detail.BlogPost.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Parts\Localization.ContentTranslations.BlogPost.cshtml" />
+    <Content Include="Views\Parts\Localization.ContentTranslations.Detail.BlogPost.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Parts\Common.Body.BlogPost.cshtml" />
+    <Content Include="Views\Parts\Common.Body.Detail.BlogPost.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Parts\Tags.ShowTags.BlogPost.cshtml" />
+    <Content Include="Views\Parts\Tags.ShowTags.Detail.BlogPost.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.BlogPost.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content.Detail.BlogPost.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Detail.BlogPost.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.BlogPost.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Body.Detail.BlogPost.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Detail.BlogPost.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.BlogPost.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Common.Metadata.Detail.BlogPost.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Detail.BlogPost.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.BlogPost.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Localization.ContentTranslations.Detail.BlogPost.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/PublishLater.Metadata.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/PublishLater.Metadata.Detail.BlogPost.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/PublishLater.Metadata.BlogPost.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/PublishLater.Metadata.Detail.BlogPost.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.BlogPost.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Detail.BlogPost.cshtml
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.BlogPost.cshtml
rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Tags.ShowTags.Detail.BlogPost.cshtml
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml
index f52ac112d..887980133 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml
@@ -1,12 +1,11 @@
-@model Orchard.Comments.Models.CommentsPart
-@using Orchard.Comments.Models;
+@using Orchard.Comments.Models;
 @using Orchard.Comments;
 @using Orchard.Security;
 @using Orchard.Utility.Extensions;
 
-@if (Model.Comments.Count > 0) { 
-<h2 id="comments">@T.Plural("1 Comment", "{0} Comments", Model.Comments.Count)</h2>
-@Html.RenderPartial("ListOfComments", Model.Comments);
+@if (Model.ContentPart.Comments.Count > 0) { 
+<h2 id="comments">@T.Plural("1 Comment", "{0} Comments", (int)Model.ContentPart.Comments.Count)</h2>
+Html.RenderPartial("ListOfComments", (IEnumerable<Orchard.Comments.Models.CommentPart>)Model.ContentPart.Comments);
 }
 
 @if (Model.CommentsActive == false) {
@@ -21,7 +20,7 @@ else if(!Request.IsAuthenticated && !AuthorizedFor(Permissions.AddComment)) {
 using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { 
     @Html.ValidationSummary() 
     <h2 id="addacomment">@T("Add a Comment")</h2>
-    @if (!Request.IsAuthenticated) { 
+    if (!Request.IsAuthenticated) { 
     <fieldset class="who">
         <div>
             <label for="Name">@T("Name")</label>
@@ -37,18 +36,17 @@ using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, Fo
         </div>
     </fieldset>
     } else {
-        var currentUser = Html.Resolve<IAuthenticationService>().GetAuthenticatedUser();
-        @Html.Hidden("Name", currentUser.UserName ?? "")
-        @Html.Hidden("Email", currentUser.Email ?? "")
+        @Html.Hidden("Name", WorkContext.CurrentUser.UserName ?? "")
+        @Html.Hidden("Email", WorkContext.CurrentUser.Email ?? "")
     }
     <fieldset class="what">
         <div>
-            <label for="CommentText">@if (Request.IsAuthenticated) { T("Hi, {0}!", Html.Encode(Page.User.Identity.Name))<br /> } @T("Comment")</label>
+            <label for="CommentText">@if (Request.IsAuthenticated) { @T("Hi, {0}!", Html.Encode(WorkContext.CurrentUser.UserName))<br /> } @T("Comment")</label>
             <textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
         </div>
         <div>
             <input type="submit" class="button" value="@T("Submit Comment")" />
-            @Html.Hidden("CommentedOn", Model.ContentItem.Id) 
+            @Html.Hidden("CommentedOn", (int)Model.ContentPart.ContentItem.Id) 
             @Html.Hidden("ReturnUrl", Context.Request.ToUrlString()) 
             @Html.AntiForgeryTokenOrchard() 
         </div>