diff --git a/src/Orchard.Specs/Comments.feature b/src/Orchard.Specs/Comments.feature
index 71217a605..10aeea69c 100644
--- a/src/Orchard.Specs/Comments.feature
+++ b/src/Orchard.Specs/Comments.feature
@@ -21,7 +21,7 @@ Scenario: HTML markup in any given comment is encoded
         And I go to "my-blog/my-post"
         And I fill in
             | name | value |
-            | CommentText | This is<br id="bad-br" />a <a href="#">link</a>. |
+            | Comments.CommentText | This is<br id="bad-br" />a <a href="#">link</a>. |
         And I hit "Submit Comment"
         And I am redirected
         # because the ToUrlString extension method breaks in this specific (test) environment, the returnUrl is broken...
@@ -34,8 +34,8 @@ Scenario: HTML markup in any given comment is encoded
         And I go to "my-blog/my-post"
         And I fill in
             | name | value |
-            | Name | Some One |
-            | CommentText | This is<br id="bad-anon-br" />a <a href="#">link</a>. |
+            | Comments.Author | Some One |
+            | Comments.CommentText | This is<br id="bad-anon-br" />a <a href="#">link</a>. |
         And I hit "Submit Comment"
         And I am redirected
         # because the ToUrlString extension method breaks in this specific (test) environment, the returnUrl is broken...
diff --git a/src/Orchard.Specs/Comments.feature.cs b/src/Orchard.Specs/Comments.feature.cs
index 3b19850b3..a6494aa0c 100644
--- a/src/Orchard.Specs/Comments.feature.cs
+++ b/src/Orchard.Specs/Comments.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.18003
+//      Runtime Version:4.0.30319.18010
 // 
 //      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
@@ -114,7 +114,7 @@ this.ScenarioSetup(scenarioInfo);
                         "name",
                         "value"});
             table3.AddRow(new string[] {
-                        "CommentText",
+                        "Comments.CommentText",
                         "This is<br id=\"bad-br\" />a <a href=\"#\">link</a>."});
 #line 22
         testRunner.And("I fill in", ((string)(null)), table3, "And ");
@@ -139,10 +139,10 @@ this.ScenarioSetup(scenarioInfo);
                         "name",
                         "value"});
             table4.AddRow(new string[] {
-                        "Name",
+                        "Comments.Author",
                         "Some One"});
             table4.AddRow(new string[] {
-                        "CommentText",
+                        "Comments.CommentText",
                         "This is<br id=\"bad-anon-br\" />a <a href=\"#\">link</a>."});
 #line 35
         testRunner.And("I fill in", ((string)(null)), table4, "And ");