diff --git a/src/Orchard.Specs/Blogs.feature b/src/Orchard.Specs/Blogs.feature
index c3e87d12f..237384d14 100644
--- a/src/Orchard.Specs/Blogs.feature
+++ b/src/Orchard.Specs/Blogs.feature
@@ -67,7 +67,7 @@ Scenario: I can create a new blog with multiple blog posts each with the same ti
         And I fill in
             | name | value |
             | Title.Title | My Post |
-            | Autoroute.CurrentUrl | my-blog/my-post |
+            | AutoroutePart.CurrentUrl | my-blog/my-post |
             | Body.Text | Are you still there? |
         And I hit "Publish Now"
         And I go to "my-blog/my-post-3"
@@ -141,7 +141,7 @@ Scenario: I set my blog to be the content for the home page and the posts for th
         And I fill in
             | name | value |
             | Title.Title | My Blog |
-            | Autoroute.PromoteToHomePage | true |
+            | AutoroutePart.PromoteToHomePage | true |
         And I hit "Save"
         And I go to "admin/blogs"
         And I follow "My Blog"
@@ -275,20 +275,20 @@ Scenario: I can create browse blog posts on several pages
         And I should not see "<h1[^>]*>.*?My Post 3.*?</h1>"
 
 Scenario: I can create a new blog with a percent sign in the title and it gets stripped out of the slug
-	   Given I have installed Orchard
-	   When I go to "admin/blogs/create"
-	   And I fill in
-	     | name        | value   |
-	     | Title.Title | My Blog |
-	   And I hit "Save"
-	   And I go to "admin/blogs"
-	   And I follow "My Blog"
-	   And I follow "New Post" where class name has "primaryAction"
-	   And I fill in
-	     | name        | value                 |
-	     | Title.Title | My Post with a % Sign |
-	     | Body.Text   | Hi there.             |
-	   And I hit "Publish Now"
-	   And I go to "my-blog/my-post-with-a-sign"
-	   Then I should see "<h1[^>]*>.*?My Post with a % Sign.*?</h1>"
- 	   And I should see "Hi there."
\ No newline at end of file
+       Given I have installed Orchard
+       When I go to "admin/blogs/create"
+       And I fill in
+         | name        | value   |
+         | Title.Title | My Blog |
+       And I hit "Save"
+       And I go to "admin/blogs"
+       And I follow "My Blog"
+       And I follow "New Post" where class name has "primaryAction"
+       And I fill in
+         | name        | value                 |
+         | Title.Title | My Post with a % Sign |
+         | Body.Text   | Hi there.             |
+       And I hit "Publish Now"
+       And I go to "my-blog/my-post-with-a-sign"
+       Then I should see "<h1[^>]*>.*?My Post with a % Sign.*?</h1>"
+       And I should see "Hi there."
\ No newline at end of file
diff --git a/src/Orchard.Specs/Blogs.feature.cs b/src/Orchard.Specs/Blogs.feature.cs
index f420e7133..74fabba3f 100644
--- a/src/Orchard.Specs/Blogs.feature.cs
+++ b/src/Orchard.Specs/Blogs.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.34014
+//      Runtime Version:4.0.30319.42000
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
@@ -234,7 +234,7 @@ this.ScenarioSetup(scenarioInfo);
                         "Title.Title",
                         "My Post"});
             table6.AddRow(new string[] {
-                        "Autoroute.CurrentUrl",
+                        "AutoroutePart.CurrentUrl",
                         "my-blog/my-post"});
             table6.AddRow(new string[] {
                         "Body.Text",
@@ -449,7 +449,7 @@ this.ScenarioSetup(scenarioInfo);
                         "Title.Title",
                         "My Blog"});
             table12.AddRow(new string[] {
-                        "Autoroute.PromoteToHomePage",
+                        "AutoroutePart.PromoteToHomePage",
                         "true"});
 #line 141
         testRunner.And("I fill in", ((string)(null)), table12, "And ");
@@ -779,9 +779,9 @@ this.ScenarioSetup(scenarioInfo);
 #line 277
 this.ScenarioSetup(scenarioInfo);
 #line 278
-    testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
+       testRunner.Given("I have installed Orchard", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Given ");
 #line 279
-    testRunner.When("I go to \"admin/blogs/create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+       testRunner.When("I go to \"admin/blogs/create\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
 #line hidden
             TechTalk.SpecFlow.Table table27 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -790,15 +790,15 @@ this.ScenarioSetup(scenarioInfo);
                         "Title.Title",
                         "My Blog"});
 #line 280
-    testRunner.And("I fill in", ((string)(null)), table27, "And ");
+       testRunner.And("I fill in", ((string)(null)), table27, "And ");
 #line 283
-    testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+       testRunner.And("I hit \"Save\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line 284
-    testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+       testRunner.And("I go to \"admin/blogs\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line 285
-    testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+       testRunner.And("I follow \"My Blog\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line 286
-    testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+       testRunner.And("I follow \"New Post\" where class name has \"primaryAction\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line hidden
             TechTalk.SpecFlow.Table table28 = new TechTalk.SpecFlow.Table(new string[] {
                         "name",
@@ -810,15 +810,15 @@ this.ScenarioSetup(scenarioInfo);
                         "Body.Text",
                         "Hi there."});
 #line 287
-    testRunner.And("I fill in", ((string)(null)), table28, "And ");
+       testRunner.And("I fill in", ((string)(null)), table28, "And ");
 #line 291
-    testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+       testRunner.And("I hit \"Publish Now\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line 292
-    testRunner.And("I go to \"my-blog/my-post-with-a-sign\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+       testRunner.And("I go to \"my-blog/my-post-with-a-sign\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line 293
-    testRunner.Then("I should see \"<h1[^>]*>.*?My Post with a % Sign.*?</h1>\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
+       testRunner.Then("I should see \"<h1[^>]*>.*?My Post with a % Sign.*?</h1>\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
 #line 294
-     testRunner.And("I should see \"Hi there.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+       testRunner.And("I should see \"Hi there.\"", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
 #line hidden
             this.ScenarioCleanup();
         }
diff --git a/src/Orchard.Specs/Pages.feature b/src/Orchard.Specs/Pages.feature
index 5352b3df9..382d20e2d 100644
--- a/src/Orchard.Specs/Pages.feature
+++ b/src/Orchard.Specs/Pages.feature
@@ -25,7 +25,7 @@ Scenario: In the admin (menu) there is a link to create a Page
         And I fill in
             | name | value |
             | Title.Title | Super Duper |
-            | LayoutPart.LayoutEditor.Data | { "type": "Content", "data": "TypeName=Orchard.Layouts.Elements.Text&Content=This+is+super+number+two", "isTemplated": false, "contentType": "Orchard.Layouts.Elements.Text", "contentTypeLabel": "Text", "contentTypeClass": "text", "html": "This is super number two", "hasEditor": true } |
+            | AutoroutePart.LayoutEditor.Data | { "type": "Content", "data": "TypeName=Orchard.Layouts.Elements.Text&Content=This+is+super+number+two", "isTemplated": false, "contentType": "Orchard.Layouts.Elements.Text", "contentTypeLabel": "Text", "contentTypeClass": "text", "html": "This is super number two", "hasEditor": true } |
         And I hit "Publish Now"
         And I go to "super-duper-2"
     Then I should see "<h1[^>]*>.*?Super Duper.*?</h1>"
@@ -36,7 +36,7 @@ Scenario: In the admin (menu) there is a link to create a Page
         And I fill in
             | name | value |
             | Title.Title | Another |
-            | Autoroute.PromoteToHomePage | true |
+            | AutoroutePart.PromoteToHomePage | true |
         And I hit "Publish Now"
         And I go to "/"
     Then I should see "<h1>Another</h1>"
@@ -48,7 +48,7 @@ Scenario: In the admin (menu) there is a link to create a Page
         And I fill in
             | name | value |
             | Title.Title | Drafty |
-            | Autoroute.PromoteToHomePage | true |
+            | AutoroutePart.PromoteToHomePage | true |
         And I hit "Save"
         And I go to "/"
     Then I should see "<h1>Another</h1>"
diff --git a/src/Orchard.Specs/Pages.feature.cs b/src/Orchard.Specs/Pages.feature.cs
index 7ea3cf7d5..5a60be007 100644
--- a/src/Orchard.Specs/Pages.feature.cs
+++ b/src/Orchard.Specs/Pages.feature.cs
@@ -3,7 +3,7 @@
 //      This code was generated by SpecFlow (http://www.specflow.org/).
 //      SpecFlow Version:1.9.0.77
 //      SpecFlow Generator Version:1.9.0.0
-//      Runtime Version:4.0.30319.0
+//      Runtime Version:4.0.30319.42000
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
@@ -110,7 +110,7 @@ this.ScenarioSetup(scenarioInfo);
                         "Title.Title",
                         "Super Duper"});
             table2.AddRow(new string[] {
-                        "LayoutPart.LayoutEditor.Data",
+                        "AutoroutePart.LayoutEditor.Data",
                         @"{ ""type"": ""Content"", ""data"": ""TypeName=Orchard.Layouts.Elements.Text&Content=This+is+super+number+two"", ""isTemplated"": false, ""contentType"": ""Orchard.Layouts.Elements.Text"", ""contentTypeLabel"": ""Text"", ""contentTypeClass"": ""text"", ""html"": ""This is super number two"", ""hasEditor"": true }"});
 #line 25
         testRunner.And("I fill in", ((string)(null)), table2, "And ");
@@ -132,7 +132,7 @@ this.ScenarioSetup(scenarioInfo);
                         "Title.Title",
                         "Another"});
             table3.AddRow(new string[] {
-                        "Autoroute.PromoteToHomePage",
+                        "AutoroutePart.PromoteToHomePage",
                         "true"});
 #line 36
         testRunner.And("I fill in", ((string)(null)), table3, "And ");
@@ -156,7 +156,7 @@ this.ScenarioSetup(scenarioInfo);
                         "Title.Title",
                         "Drafty"});
             table4.AddRow(new string[] {
-                        "Autoroute.PromoteToHomePage",
+                        "AutoroutePart.PromoteToHomePage",
                         "true"});
 #line 48
         testRunner.And("I fill in", ((string)(null)), table4, "And ");