diff --git a/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs b/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs
index ad1ee742c..733afe807 100644
--- a/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs
+++ b/src/Orchard.Core.Tests/Routable/Services/RoutableServiceTests.cs
@@ -72,12 +72,12 @@ namespace Orchard.Core.Tests.Routable.Services {
 
             var thing = contentManager.Create<Thing>("thing", t => {
                 t.As<RoutePart>().Record = new RoutePartRecord();
-                t.Title = "Please do not use any of the following characters in your slugs: \":\", \"?\", \"#\", \"[\", \"]\", \"@\", \"!\", \"$\", \"&\", \"'\", \"(\", \")\", \"*\", \"+\", \",\", \";\", \"=\", \"\"\", \"<\", \">\"";
+                t.Title = "Please do not use any of the following characters in your permalink: \":\", \"?\", \"#\", \"[\", \"]\", \"@\", \"!\", \"$\", \"&\", \"'\", \"(\", \")\", \"*\", \"+\", \",\", \";\", \"=\", \"\"\", \"<\", \">\"";
             });
 
             _routableService.FillSlugFromTitle(thing.As<RoutePart>());
 
-            Assert.That(thing.Slug, Is.EqualTo("please-do-not-use-any-of-the-following-characters-in-your-slugs"));
+            Assert.That(thing.Slug, Is.EqualTo("please-do-not-use-any-of-the-following-characters-in-your-permalink"));
         }
 
         [Test]
diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs
index 5eab3cd3e..dd035565e 100644
--- a/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs
+++ b/src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs
@@ -87,9 +87,9 @@ namespace Orchard.Core.Routable.Drivers {
             if ( !_routableService.IsSlugValid(part.Slug) ) {
                 var slug = (part.Slug ?? String.Empty);
                 if ( slug.StartsWith(".") || slug.EndsWith(".") )
-                    updater.AddModelError("Routable.Slug", T("The \".\" can't be used around routes."));
+                    updater.AddModelError("Routable.Slug", T("The \".\" can't be used at either end of the permalink."));
                 else
-                    updater.AddModelError("Routable.Slug", T("Please do not use any of the following characters in your slugs: \":\", \"?\", \"#\", \"[\", \"]\", \"@\", \"!\", \"$\", \"&\", \"'\", \"(\", \")\", \"*\", \"+\", \",\", \";\", \"=\", \", \"<\", \">\". No spaces are allowed (please use dashes or underscores instead)."));
+                    updater.AddModelError("Routable.Slug", T("Please do not use any of the following characters in your permalink: \":\", \"?\", \"#\", \"[\", \"]\", \"@\", \"!\", \"$\", \"&\", \"'\", \"(\", \")\", \"*\", \"+\", \",\", \";\", \"=\", \", \"<\", \">\". No spaces are allowed (please use dashes or underscores instead)."));
             }
 
             return Editor(part, shapeHelper);
diff --git a/src/Orchard.Web/Core/Routable/Handlers/RoutePartHandler.cs b/src/Orchard.Web/Core/Routable/Handlers/RoutePartHandler.cs
index aca1ffaf7..16c5bd8b4 100644
--- a/src/Orchard.Web/Core/Routable/Handlers/RoutePartHandler.cs
+++ b/src/Orchard.Web/Core/Routable/Handlers/RoutePartHandler.cs
@@ -41,7 +41,7 @@ namespace Orchard.Core.Routable.Handlers {
             Action<RoutePart> processSlug = (
                 routable => {
                     if (!_routableService.ProcessSlug(routable))
-                        _services.Notifier.Warning(T("Slugs in conflict. \"{0}\" is already set for a previously created {2} so now it has the slug \"{1}\"",
+                        _services.Notifier.Warning(T("Permalinks in conflict. \"{0}\" is already set for a previously created {2} so now it has the slug \"{1}\"",
                                                      routable.Slug, routable.GetEffectiveSlug(), routable.ContentItem.ContentType));
                 });