diff --git a/src/Orchard.Tests/UI/Navigation/MenuItemComparerTests.cs b/src/Orchard.Tests/UI/Navigation/MenuItemComparerTests.cs
index c1f590d97..36170d6d9 100644
--- a/src/Orchard.Tests/UI/Navigation/MenuItemComparerTests.cs
+++ b/src/Orchard.Tests/UI/Navigation/MenuItemComparerTests.cs
@@ -7,50 +7,50 @@ namespace Orchard.Tests.UI.Navigation {
     public class MenuItemComparerTests {
         [Test]
         public void TextShouldCauseDifferenceAndNullRouteValuesAreEqual() {
-            var item1 = new MenuItem { Text = "hello" };
-            var item2 = new MenuItem { Text = "hello" };
-            var item3 = new MenuItem { Text = "hello3" };
+            var item1 = new MenuItem { TextHint = "hello" };
+            var item2 = new MenuItem { TextHint = "hello" };
+            var item3 = new MenuItem { TextHint = "hello3" };
             AssertSameSameDifferent(item1, item2, item3);
         }
 
         [Test]
-        public void NullRouteValuesShouldNotEqualEmptyRouteValues() {
-            var item1 = new MenuItem { Text = "hello" };
-            var item2 = new MenuItem { Text = "hello" };
-            var item3 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary() };
-            var item4 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary() };
-            AssertSameSameDifferent(item1, item2, item3);
-            AssertSameSameDifferent(item3, item4, item1);
+        public void NullRouteValuesShouldEqualEmptyRouteValues() {
+            var item1 = new MenuItem { TextHint = "hello" };
+            var item2 = new MenuItem { TextHint = "hello" };
+            var item3 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary() };
+            var item4 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary() };
+            AssertSameSameSame(item1, item2, item3);
+            AssertSameSameSame(item3, item4, item1);
         }
         [Test]
         public void AdditionalPropertiesShouldMismatch() {
-            var item1 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = 1 }) };
-            var item2 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = 1 }) };
-            var item3 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = 1, two = 2 }) };
+            var item1 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = 1 }) };
+            var item2 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = 1 }) };
+            var item3 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = 1, two = 2 }) };
             AssertSameSameDifferent(item1, item2, item3);
         }
 
         [Test]
         public void ValueTypeShouldMismatch() {
-            var item1 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = 1 }) };
-            var item2 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = 1 }) };
-            var item3 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1" }) };
+            var item1 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = 1 }) };
+            var item2 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = 1 }) };
+            var item3 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = "1" }) };
             AssertSameSameDifferent(item1, item2, item3);
         }
 
         [Test]
         public void ValuesShouldMismatch() {
-            var item1 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }) };
-            var item2 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }) };
-            var item3 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "3" }) };
+            var item1 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }) };
+            var item2 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }) };
+            var item3 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "3" }) };
             AssertSameSameDifferent(item1, item2, item3);
         }
 
         [Test]
         public void PositionAndChildrenDontMatter() {
-            var item1 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }) };
-            var item2 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }), Position = "4.0" };
-            var item3 = new MenuItem { Text = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }), Items = new[] { new MenuItem() } };
+            var item1 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }) };
+            var item2 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }), Position = "4.0" };
+            var item3 = new MenuItem { TextHint = "hello", RouteValues = new RouteValueDictionary(new { one = "1", two = "2" }), Items = new[] { new MenuItem() } };
             AssertSameSameSame(item1, item2, item3);
         }
 
diff --git a/src/Orchard.Tests/UI/Navigation/NavigationManagerTests.cs b/src/Orchard.Tests/UI/Navigation/NavigationManagerTests.cs
index aad49a912..85940f366 100644
--- a/src/Orchard.Tests/UI/Navigation/NavigationManagerTests.cs
+++ b/src/Orchard.Tests/UI/Navigation/NavigationManagerTests.cs
@@ -56,19 +56,19 @@ namespace Orchard.Tests.UI.Navigation {
             var item2 = menuItems.Skip(1).First();
             var item3 = menuItems.Skip(2).First();
 
-            Assert.That(item1.Text, Is.EqualTo("Foo"));
+            Assert.That(item1.TextHint, Is.EqualTo("Foo"));
             Assert.That(item1.Position, Is.EqualTo("1.0"));
-            Assert.That(item2.Text, Is.EqualTo("Bar"));
+            Assert.That(item2.TextHint, Is.EqualTo("Bar"));
             Assert.That(item2.Position, Is.EqualTo("2.0"));
-            Assert.That(item3.Text, Is.EqualTo("Frap"));
+            Assert.That(item3.TextHint, Is.EqualTo("Frap"));
             Assert.That(item3.Position, Is.EqualTo("3.0"));
 
             Assert.That(item2.Items.Count(), Is.EqualTo(2));
             var subitem1 = item2.Items.First();
             var subitem2 = item2.Items.Last();
-            Assert.That(subitem1.Text, Is.EqualTo("Quad"));
+            Assert.That(subitem1.TextHint, Is.EqualTo("Quad"));
             Assert.That(subitem1.Position, Is.EqualTo("1.a"));
-            Assert.That(subitem2.Text, Is.EqualTo("Frap"));
+            Assert.That(subitem2.TextHint, Is.EqualTo("Frap"));
             Assert.That(subitem2.Position, Is.EqualTo("1.b"));
         }
 
@@ -78,8 +78,8 @@ namespace Orchard.Tests.UI.Navigation {
             public void GetNavigation(NavigationBuilder builder) {
                 var T = NullLocalizer.Instance;
                 builder
-                    .Add(T("Foo"), "1.0", x => x.Action("foo"))
-                    .Add(T("Bar"), "2.0", x => x.Add(T("Frap"), "1.b"));
+                    .Add(new LocalizedString("Foo", "", "Foo", null), "1.0", x => x.Action("foo"))
+                    .Add(new LocalizedString("Bar", "", "Bar", null), "2.0", x => x.Add(new LocalizedString("Frap", "", "Frap", null), "1.b"));
             }
         }
 
@@ -89,8 +89,8 @@ namespace Orchard.Tests.UI.Navigation {
             public void GetNavigation(NavigationBuilder builder) {
                 var T = NullLocalizer.Instance;
                 builder
-                    .Add(T("Frap"), "3.0", x => x.Action("foo"))
-                    .Add(T("Bar"), "4.0", x => x.Add(T("Quad"), "1.a"));
+                    .Add(new LocalizedString("Frap", "", "Frap", null), "3.0", x => x.Action("foo"))
+                    .Add(new LocalizedString("Bar", "", "Bar", null), "4.0", x => x.Add(new LocalizedString("Quad", "", "Quad", null), "1.a"));
             }
         }
     }