diff --git a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
index c67906061..f7dcb3d6a 100644
--- a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
@@ -10,7 +10,6 @@ using Orchard.Localization;
 using Orchard.Mvc.AntiForgery;
 using Orchard.UI.Navigation;
 using Orchard.Utility;
-using MenuItem=Orchard.Core.Navigation.Models.MenuItem;
 
 namespace Orchard.Core.Navigation.Controllers {
     [ValidateInput(false)]
@@ -51,8 +50,8 @@ namespace Orchard.Core.Navigation.Controllers {
 
                 menuPart.MenuText = menuItemEntry.MenuItem.Text;
                 menuPart.MenuPosition = menuItemEntry.MenuItem.Position;
-                if (menuPart.Is<MenuItem>())
-                    menuPart.As<MenuItem>().Url = menuItemEntry.MenuItem.Url;
+                if (menuPart.Is<MenuItemPart>())
+                    menuPart.As<MenuItemPart>().Url = menuItemEntry.MenuItem.Url;
 
                 _services.ContentManager.UpdateEditorModel(menuPart, this);
             }
@@ -65,12 +64,12 @@ namespace Orchard.Core.Navigation.Controllers {
                                          MenuItem = new UI.Navigation.MenuItem {
                                                                                    Text = menuPart.MenuText,
                                                                                    Position = menuPart.MenuPosition,
-                                                                                   Url = menuPart.Is<MenuItem>()
-                                                                                             ? menuPart.As<MenuItem>().Url
+                                                                                   Url = menuPart.Is<MenuItemPart>()
+                                                                                             ? menuPart.As<MenuItemPart>().Url
                                                                                              : _navigationManager.GetUrl(null, _services.ContentManager.GetItemMetadata(menuPart).DisplayRouteValues)
                                                                                },
                                          MenuItemId = menuPart.Id,
-                                         IsMenuItem = menuPart.Is<MenuItem>()
+                                         IsMenuItem = menuPart.Is<MenuItemPart>()
                                      };
         }
 
@@ -83,7 +82,7 @@ namespace Orchard.Core.Navigation.Controllers {
             if (!_services.Authorizer.Authorize(Permissions.ManageMainMenu, T("Couldn't manage the main menu")))
                 return new HttpUnauthorizedResult();
 
-            var menuPart = _services.ContentManager.New<MenuPart>(MenuItemDriver.ContentType.Name);
+            var menuPart = _services.ContentManager.New<MenuPart>(MenuItemPartDriver.ContentType.Name);
             model.MenuItem = _services.ContentManager.UpdateEditorModel(menuPart, this);
 
             if (!ModelState.IsValid) {
@@ -108,7 +107,7 @@ namespace Orchard.Core.Navigation.Controllers {
             MenuPart menuPart = _menuService.Get(id);
 
             if (menuPart != null) {
-                if (menuPart.Is<MenuItem>())
+                if (menuPart.Is<MenuItemPart>())
                     _menuService.Delete(menuPart);
                 else
                     menuPart.OnMainMenu = false;
diff --git a/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs b/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs
index cce18c2f2..58478db12 100644
--- a/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs
+++ b/src/Orchard.Web/Core/Navigation/DataMigrations/NavigationDataMigration.cs
@@ -10,7 +10,7 @@ namespace Orchard.Core.Navigation.DataMigrations {
 
         public int Create() {
             //CREATE TABLE Navigation_MenuItemRecord (Id INTEGER not null, Url TEXT, primary key (Id));
-            SchemaBuilder.CreateTable("MenuItemRecord", table => table
+            SchemaBuilder.CreateTable("MenuItemPartRecord", table => table
                 .ContentPartRecord()
                 .Column<string>("Url")
                 );
diff --git a/src/Orchard.Web/Core/Navigation/Drivers/MenuItemDriver.cs b/src/Orchard.Web/Core/Navigation/Drivers/MenuItemPartDriver.cs
similarity index 68%
rename from src/Orchard.Web/Core/Navigation/Drivers/MenuItemDriver.cs
rename to src/Orchard.Web/Core/Navigation/Drivers/MenuItemPartDriver.cs
index f4636970f..ce483d2bf 100644
--- a/src/Orchard.Web/Core/Navigation/Drivers/MenuItemDriver.cs
+++ b/src/Orchard.Web/Core/Navigation/Drivers/MenuItemPartDriver.cs
@@ -6,7 +6,7 @@ using Orchard.Security;
 
 namespace Orchard.Core.Navigation.Drivers {
     [UsedImplicitly]
-    public class MenuItemDriver : ContentItemDriver<MenuItem> {
+    public class MenuItemPartDriver : ContentItemDriver<MenuItemPart> {
         private readonly IAuthorizationService _authorizationService;
 
         public readonly static ContentType ContentType = new ContentType {
@@ -14,7 +14,7 @@ namespace Orchard.Core.Navigation.Drivers {
                                                                              DisplayName = "Menu Item"
                                                                          };
 
-        public MenuItemDriver(IAuthorizationService authorizationService) {
+        public MenuItemPartDriver(IAuthorizationService authorizationService) {
             _authorizationService = authorizationService;
         }
 
@@ -26,15 +26,15 @@ namespace Orchard.Core.Navigation.Drivers {
 
         protected override string Prefix { get { return ""; } }
 
-        protected override string GetDisplayText(MenuItem item) {
-            return item.Url;
+        protected override string GetDisplayText(MenuItemPart itemPart) {
+            return itemPart.Url;
         }
 
-        protected override DriverResult Editor(MenuItem item, IUpdateModel updater) {
-            if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, item))
+        protected override DriverResult Editor(MenuItemPart itemPart, IUpdateModel updater) {
+            if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, itemPart))
                 return null;
 
-            updater.TryUpdateModel(item, Prefix, null, null);
+            updater.TryUpdateModel(itemPart, Prefix, null, null);
 
             return null;
         }
diff --git a/src/Orchard.Web/Core/Navigation/Handlers/MenuItemHandler.cs b/src/Orchard.Web/Core/Navigation/Handlers/MenuItemPartHandler.cs
similarity index 55%
rename from src/Orchard.Web/Core/Navigation/Handlers/MenuItemHandler.cs
rename to src/Orchard.Web/Core/Navigation/Handlers/MenuItemPartHandler.cs
index a5567ba48..54d9bf791 100644
--- a/src/Orchard.Web/Core/Navigation/Handlers/MenuItemHandler.cs
+++ b/src/Orchard.Web/Core/Navigation/Handlers/MenuItemPartHandler.cs
@@ -6,9 +6,9 @@ using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Core.Navigation.Handlers {
     [UsedImplicitly]
-    public class MenuItemHandler : ContentHandler {
-        public MenuItemHandler(IRepository<MenuItemRecord> repository) {
-            Filters.Add(new ActivatingFilter<MenuItem>(MenuItemDriver.ContentType.Name));
+    public class MenuItemPartHandler : ContentHandler {
+        public MenuItemPartHandler(IRepository<MenuItemPartRecord> repository) {
+            Filters.Add(new ActivatingFilter<MenuItemPart>(MenuItemPartDriver.ContentType.Name));
             Filters.Add(StorageFilter.For(repository));
         }
     }
diff --git a/src/Orchard.Web/Core/Navigation/Models/MenuItem.cs b/src/Orchard.Web/Core/Navigation/Models/MenuItemPart.cs
similarity index 82%
rename from src/Orchard.Web/Core/Navigation/Models/MenuItem.cs
rename to src/Orchard.Web/Core/Navigation/Models/MenuItemPart.cs
index 6f7375bf7..ad97500f7 100644
--- a/src/Orchard.Web/Core/Navigation/Models/MenuItem.cs
+++ b/src/Orchard.Web/Core/Navigation/Models/MenuItemPart.cs
@@ -3,7 +3,7 @@ using System.Web.Mvc;
 using Orchard.ContentManagement;
 
 namespace Orchard.Core.Navigation.Models {
-    public class MenuItem : ContentPart<MenuItemRecord> {
+    public class MenuItemPart : ContentPart<MenuItemPartRecord> {
         [HiddenInput(DisplayValue = false)]
         public int Id { get { return ContentItem.Id; } }
 
diff --git a/src/Orchard.Web/Core/Navigation/Models/MenuItemRecord.cs b/src/Orchard.Web/Core/Navigation/Models/MenuItemPartRecord.cs
similarity index 69%
rename from src/Orchard.Web/Core/Navigation/Models/MenuItemRecord.cs
rename to src/Orchard.Web/Core/Navigation/Models/MenuItemPartRecord.cs
index 090a7ae8e..c39cf0283 100644
--- a/src/Orchard.Web/Core/Navigation/Models/MenuItemRecord.cs
+++ b/src/Orchard.Web/Core/Navigation/Models/MenuItemPartRecord.cs
@@ -1,7 +1,7 @@
 using Orchard.ContentManagement.Records;
 
 namespace Orchard.Core.Navigation.Models {
-    public class MenuItemRecord : ContentPartRecord {
+    public class MenuItemPartRecord : ContentPartRecord {
         public virtual string Url { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs b/src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs
index a2fc8a4be..7b6a9ecbe 100644
--- a/src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs
+++ b/src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs
@@ -4,7 +4,6 @@ using Orchard.ContentManagement;
 using Orchard.Core.Navigation.Models;
 using Orchard.Localization;
 using Orchard.UI.Navigation;
-using MenuItem=Orchard.Core.Navigation.Models.MenuItem;
 
 namespace Orchard.Core.Navigation.Services {
     [UsedImplicitly]
@@ -35,9 +34,9 @@ namespace Orchard.Core.Navigation.Services {
                 if (menuPart != null ) {
                     var part = menuPart;
 
-                    if (part.Is<MenuItem>())
+                    if (part.Is<MenuItemPart>())
                         builder.Add(
-                            menu => menu.Add(new LocalizedString(part.MenuText), part.MenuPosition, nib => nib.Url(part.As<MenuItem>().Url)));
+                            menu => menu.Add(new LocalizedString(part.MenuText), part.MenuPosition, nib => nib.Url(part.As<MenuItemPart>().Url)));
                     else
                         builder.Add(
                             menu =>
diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx
index 3afc1bc8f..65e762d5a 100644
--- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.ascx
@@ -58,7 +58,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("create"), FormMethod.Post)) { %
             </td>
             <td>
                 <label for="Url"><%: T("Url")%></label>
-                <%: Html.EditorFor(nmvm => nmvm.NewMenuItem.MenuItem.Item.As<Orchard.Core.Navigation.Models.MenuItem>().Url)%>
+                <%: Html.EditorFor(nmvm => nmvm.NewMenuItem.MenuItem.Item.As<Orchard.Core.Navigation.Models.MenuItemPart>().Url)%>
             </td>
             <td><button class="add" type="submit"><%: T("Add") %></button></td>
         </tr>
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index afc54e165..f3a28c17c 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -161,14 +161,14 @@
     <Compile Include="Localization\Models\LocalizationPartRecord.cs" />
     <Compile Include="Navigation\AdminMenu.cs" />
     <Compile Include="Navigation\Controllers\AdminController.cs" />
-    <Compile Include="Navigation\Models\MenuItem.cs" />
-    <Compile Include="Navigation\Drivers\MenuItemDriver.cs" />
-    <Compile Include="Navigation\Handlers\MenuItemHandler.cs" />
+    <Compile Include="Navigation\Models\MenuItemPart.cs" />
+    <Compile Include="Navigation\Drivers\MenuItemPartDriver.cs" />
+    <Compile Include="Navigation\Handlers\MenuItemPartHandler.cs" />
     <Compile Include="Navigation\Models\MenuPart.cs" />
     <Compile Include="Navigation\Drivers\MenuPartDriver.cs" />
     <Compile Include="Navigation\Handlers\MenuPartHandler.cs" />
     <Compile Include="Navigation\Permissions.cs" />
-    <Compile Include="Navigation\Models\MenuItemRecord.cs" />
+    <Compile Include="Navigation\Models\MenuItemPartRecord.cs" />
     <Compile Include="Navigation\Models\MenuPartRecord.cs" />
     <Compile Include="Navigation\Services\IMenuService.cs" />
     <Compile Include="Navigation\Services\MainMenuService.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index f4c77162c..6e72e844a 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -230,7 +230,7 @@ namespace Orchard.Setup.Services {
                     menuItem.As<MenuPart>().MenuPosition = "1";
                     menuItem.As<MenuPart>().MenuText = T("Home").ToString();
                     menuItem.As<MenuPart>().OnMainMenu = true;
-                    menuItem.As<MenuItem>().Url = "";
+                    menuItem.As<MenuItemPart>().Url = "";
 
                     //Temporary fix for running setup on command line
                     if (HttpContext.Current != null) {