diff --git a/features/comments.feature b/features/comments.feature
index cb6e7eb1c..2c5742bbd 100644
--- a/features/comments.feature
+++ b/features/comments.feature
@@ -25,8 +25,8 @@ Feature: commenting
     And I am on "alice@alice.alice"'s page
     Then I should see "Look at this dog"
     When I focus the comment field
-    And I fill in "comment" with "is that a poodle?"
-    And I press "comment"
+    And I fill in "Comment" with "is that a poodle?"
+    And I press "Comment"
     Then I should see "is that a poodle?" within "li.comment div.content"
     And I should see "less than a minute ago" within "li.comment time"
 
@@ -34,8 +34,8 @@ Feature: commenting
     When I sign in as "bob@bob.bob"
     And I am on the photo page for "alice@alice.alice"'s post "Look at this dog"
     And I focus the comment field
-    And I fill in "comment" with "hahahah"
-    And I press "comment"
+    And I fill in "Comment" with "hahahah"
+    And I press "Comment"
     Then I should see "hahaha" within "li.comment div.content"
     And I should see "less than a minute ago" within "li.comment time"
 
@@ -43,8 +43,8 @@ Feature: commenting
     When I sign in as "alice@alice.alice"
     And I am on the photo page for "alice@alice.alice"'s post "Look at this dog"
     And I focus the comment field
-    And I fill in "comment" with "hahahah"
-    And I press "comment"
+    And I fill in "Comment" with "hahahah"
+    And I press "Comment"
     Then I should see "hahaha" within "li.comment div.content"
     And I should see "less than a minute ago" within "li.comment time"
 
@@ -53,8 +53,8 @@ Feature: commenting
     And I am on "alice@alice.alice"'s page
     Then I should see "Look at this dog"
     When I focus the comment field
-    And I fill in "comment" with "is that a poodle?"
-    And I press "comment"
+    And I fill in "Comment" with "is that a poodle?"
+    And I press "Comment"
     And I wait for the ajax to finish
     When I hover over the comment
     And I preemptively confirm the alert
@@ -83,7 +83,7 @@ Feature: commenting
     When I follow "less than a minute ago"
     Then I should see "Look at this dog"
     And I fill in "text" with "I think thats a cat"
-    And I press "comment"
+    And I press "Comment"
     And I wait for the ajax to finish
     When I am on "alice@alice.alice"'s page
     Then I should see "I think thats a cat"