diff --git a/.hgsubstate b/.hgsubstate
index fac0bee43..5a60f5eb9 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,5 +1,5 @@
 1f8f582859916d411b5333dd0f32f57da0e72ee8 src/Orchard.Web/Modules/Orchard.AntiSpam
-5257b79de7ea0cdcd1bebc04f922fe9bbb127944 src/Orchard.Web/Modules/Orchard.Autoroute
+e270989b0b0bcee22c03021af5a028215bcdefe9 src/Orchard.Web/Modules/Orchard.Autoroute
 2ca2dbbf97b7219f9150d46d52f62bc405c17673 src/Orchard.Web/Modules/Orchard.ContentPermissions
 e6e70d69f37e48ea6c8784e83a9af4103f5d0dde src/Orchard.Web/Modules/Orchard.ContentPicker
 b5ccdaed10ff8bcd5bc94d46541209873ae0f722 src/Orchard.Web/Modules/Orchard.CustomForms
diff --git a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
index e2dfcbac3..0e23583bd 100644
--- a/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
+++ b/src/Orchard.Tests/ContentManagement/ContentQueryTests.cs
@@ -454,7 +454,7 @@ namespace Orchard.Tests.ContentManagement {
         }
 
         [Test]
-        public void IsStartingExtensionShouldBeUsed() {
+        public void StartsWithExtensionShouldBeUsed() {
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "one"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
@@ -462,7 +462,7 @@ namespace Orchard.Tests.ContentManagement {
             _session.Flush();
 
             var result = _manager.Query<GammaPart, GammaRecord>()
-                .Where(x => x.Frap.IsStartingWith("t"))
+                .Where(x => x.Frap.StartsWith("t"))
                 .List();
 
             Assert.That(result.Count(), Is.EqualTo(2));
@@ -471,7 +471,7 @@ namespace Orchard.Tests.ContentManagement {
         }
 
         [Test]
-        public void IsEndingExtensionShouldBeUsed() {
+        public void EndsWithExtensionShouldBeUsed() {
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "one"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
@@ -479,7 +479,7 @@ namespace Orchard.Tests.ContentManagement {
             _session.Flush();
 
             var result = _manager.Query<GammaPart, GammaRecord>()
-                .Where(x => x.Frap.IsEndingWith("e"))
+                .Where(x => x.Frap.EndsWith("e"))
                 .List();
 
             Assert.That(result.Count(), Is.EqualTo(2));
@@ -488,7 +488,7 @@ namespace Orchard.Tests.ContentManagement {
         }
 
         [Test]
-        public void IsContainingExtensionShouldBeUsed() {
+        public void ContainsExtensionShouldBeUsed() {
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "one"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
@@ -496,7 +496,7 @@ namespace Orchard.Tests.ContentManagement {
             _session.Flush();
 
             var result = _manager.Query<GammaPart, GammaRecord>()
-                .Where(x => x.Frap.IsContaining("o"))
+                .Where(x => x.Frap.Contains("o"))
                 .List();
 
             Assert.That(result.Count(), Is.EqualTo(3));
@@ -504,7 +504,6 @@ namespace Orchard.Tests.ContentManagement {
             Assert.That(result.Count(x => x.Get<GammaPart>().Record.Frap == "two"), Is.EqualTo(1));
             Assert.That(result.Count(x => x.Get<GammaPart>().Record.Frap == "four"), Is.EqualTo(1));
         }
-
     }
 }
 
diff --git a/src/Orchard/ContentManagement/RestrictionExtensions.cs b/src/Orchard/ContentManagement/RestrictionExtensions.cs
index 15324392f..b47d2ef38 100644
--- a/src/Orchard/ContentManagement/RestrictionExtensions.cs
+++ b/src/Orchard/ContentManagement/RestrictionExtensions.cs
@@ -10,42 +10,30 @@ using Orchard.ContentManagement.Records;
 namespace Orchard.ContentManagement {
     public static class RestrictionExtensions {
         public static void RegisterExtensions() {
-            ExpressionProcessor.RegisterCustomMethodCall(() => RestrictionExtensions.IsStartingWith("", ""), RestrictionExtensions.ProcessIsStartingWith);
-            ExpressionProcessor.RegisterCustomMethodCall(() => RestrictionExtensions.IsEndingWith("", ""), RestrictionExtensions.ProcessIsEndingWith);
-            ExpressionProcessor.RegisterCustomMethodCall(() => RestrictionExtensions.IsContaining("", ""), RestrictionExtensions.ProcessIsContaining);
+            ExpressionProcessor.RegisterCustomMethodCall(() => "".StartsWith(""), RestrictionExtensions.ProcessStartsWith);
+            ExpressionProcessor.RegisterCustomMethodCall(() => "".EndsWith(""), RestrictionExtensions.ProcessEndsWith);
+            ExpressionProcessor.RegisterCustomMethodCall(() => "".Contains(""), RestrictionExtensions.ProcessContains);
         }
 
-        public static bool IsStartingWith(this string item, string value) {
-            throw new NotImplementedException("Do not use this method directly");
-        }
-
-        public static bool IsEndingWith(this string item, string value) {
-            throw new NotImplementedException("Do not use this method directly");
-        }
-
-        public static bool IsContaining(this string item, string value) {
-            throw new NotImplementedException("Do not use this method directly");
-        }
-
-        public static ICriterion ProcessIsStartingWith(MethodCallExpression methodCallExpression) {
-            ExpressionProcessor.ProjectionInfo projection = ExpressionProcessor.FindMemberProjection(methodCallExpression.Arguments[0]);
-            string value = (string)ExpressionProcessor.FindValue(methodCallExpression.Arguments[1]);
+        public static ICriterion ProcessStartsWith(MethodCallExpression methodCallExpression) {
+            ExpressionProcessor.ProjectionInfo projection = ExpressionProcessor.FindMemberProjection(methodCallExpression.Object);
+            string value = (string)ExpressionProcessor.FindValue(methodCallExpression.Arguments[0]);
             MatchMode matchMode = MatchMode.Start;
             return projection.Create<ICriterion>(s => Restrictions.InsensitiveLike(s, value, matchMode), p => Restrictions.InsensitiveLike(p, value, matchMode));
         }
 
 
-        public static ICriterion ProcessIsEndingWith(MethodCallExpression methodCallExpression) {
-            ExpressionProcessor.ProjectionInfo projection = ExpressionProcessor.FindMemberProjection(methodCallExpression.Arguments[0]);
-            string value = (string)ExpressionProcessor.FindValue(methodCallExpression.Arguments[1]);
+        public static ICriterion ProcessEndsWith(MethodCallExpression methodCallExpression) {
+            ExpressionProcessor.ProjectionInfo projection = ExpressionProcessor.FindMemberProjection(methodCallExpression.Object);
+            string value = (string)ExpressionProcessor.FindValue(methodCallExpression.Arguments[0]);
             MatchMode matchMode = MatchMode.End;
             return projection.Create<ICriterion>(s => Restrictions.InsensitiveLike(s, value, matchMode), p => Restrictions.InsensitiveLike(p, value, matchMode));
         }
 
 
-        public static ICriterion ProcessIsContaining(MethodCallExpression methodCallExpression) {
-            ExpressionProcessor.ProjectionInfo projection = ExpressionProcessor.FindMemberProjection(methodCallExpression.Arguments[0]);
-            string value = (string)ExpressionProcessor.FindValue(methodCallExpression.Arguments[1]);
+        public static ICriterion ProcessContains(MethodCallExpression methodCallExpression) {
+            ExpressionProcessor.ProjectionInfo projection = ExpressionProcessor.FindMemberProjection(methodCallExpression.Object);
+            string value = (string)ExpressionProcessor.FindValue(methodCallExpression.Arguments[0]);
             MatchMode matchMode = MatchMode.Anywhere;
             return projection.Create<ICriterion>(s => Restrictions.InsensitiveLike(s, value, matchMode), p => Restrictions.InsensitiveLike(p, value, matchMode));
         }