diff --git a/src/Orchard.Web/Core/Shapes/CoreShapes.cs b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
index ed1bd9c2c..7fa145711 100644
--- a/src/Orchard.Web/Core/Shapes/CoreShapes.cs
+++ b/src/Orchard.Web/Core/Shapes/CoreShapes.cs
@@ -51,7 +51,7 @@ namespace Orchard.Core.Shapes {
                 .OnCreating(creating => creating.BaseType = typeof(Zone))
                 .OnDisplaying(displaying => {
                     var zone = displaying.Shape;
-                    zone.Classes.Add("zone-" + zone.ZoneName.ToLower());
+                    zone.Classes.Add("zone-" + zone.ZoneName.HtmlClassify());
                     zone.Classes.Add("zone");
                     zone.Metadata.Alternates.Add("Zone__" + zone.ZoneName);
                 });
@@ -59,7 +59,7 @@ namespace Orchard.Core.Shapes {
             builder.Describe("Menu")
                 .OnDisplaying(displaying => {
                     var menu = displaying.Shape;
-                    menu.Classes.Add("menu-" + menu.MenuName.ToLower());
+                    menu.Classes.Add("menu-" + menu.MenuName.HtmlClassify());
                     menu.Classes.Add("menu");
                     menu.Metadata.Alternates.Add("Menu__" + menu.MenuName);
                 });
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml
index e8dc9d9a3..cc4c6ee26 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml
@@ -3,8 +3,8 @@
 @{ 
 	Html.AddTitleParts(T("Tags").ToString()); 
 	Html.AddTitleParts(T("Contents tagged with {0}", Model.TagName).ToString());
-	Model.List.Classes.Add("taggedPosts");
-	Model.List.Classes.Add("contentItems");
+	Model.List.Classes.Add("tagged-posts");
+	Model.List.Classes.Add("content-items");
 }
 
 <h1 class="page-title">@T("Contents tagged with <span>{0}</span>", Model.TagName)</h1>