diff --git a/features/change_email.feature b/features/change_email.feature
index d81f4d0e8faf4540bf2d09050460ae07f702168e..14b6d5bbef26aa809197a94d1930e45b0f82b598 100644
--- a/features/change_email.feature
+++ b/features/change_email.feature
@@ -7,8 +7,8 @@ Feature: Change email
     And I follow "settings"
     Then I should be on my account settings page
     When I fill in "user_email" with "new_email@newplac.es"
-    And I press "Change E-Mail"
-    Then I should see "E-Mail Changed"
+    And I press "Change email"
+    Then I should see "Email changed"
     And I follow the "confirm_email" link from the last sent email
     Then I should see "activated"
     And my "email" should be "new_email@newplac.es"
diff --git a/features/change_password.feature b/features/change_password.feature
index 4a44797b5b74d7a98080653dccc4217550974503..aef13d45127215de93d8fac2dab00a0abdaf3c38 100644
--- a/features/change_password.feature
+++ b/features/change_password.feature
@@ -9,8 +9,8 @@ Feature: Change password
     When I put in my password in "user_current_password" 
     And I fill in "user_password" with "newsecret"
     And I fill in "user_password_confirmation" with "newsecret"
-    And I press "Change Password"
-    Then I should see "Password Changed"
+    And I press "Change password"
+    Then I should see "Password changed"
     Then I should be on the new user session page
     When I sign in with password "newsecret"
     Then I should be on the aspects page
diff --git a/features/repost.feature b/features/repost.feature
index 39567dc9fb361bbc497543f5932c543d72faf7ff..0c9251d01f4c7aab70ae7d9e53e0022032fc13be 100644
--- a/features/repost.feature
+++ b/features/repost.feature
@@ -93,6 +93,6 @@ Feature: public repost
     And I should see "Bob" 
     And I go to the home page
 
-    And I should see "1 Reshare"
+    And I should see "1 reshare"
 
   Scenario: Can have text