diff --git a/features/edit_environment_templates.feature b/features/edit_environment_templates.feature
index dfe4d35..2ecf1ce 100644
--- a/features/edit_environment_templates.feature
+++ b/features/edit_environment_templates.feature
@@ -8,7 +8,7 @@ Feature: edit environment templates
   Scenario: See links to edit all templates
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     Then I should see "Person template" link
     And I should see "Community template" link
     And I should see "Enterprise template" link
@@ -17,28 +17,28 @@ Feature: edit environment templates
   Scenario: Go to control panel of person template
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     And I follow "Person template"
     Then I should be on Person template's control panel
 
   Scenario: Go to control panel of enterprise template
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     And I follow "Enterprise template"
     Then I should be on Enterprise template's control panel
 
   Scenario: Go to control panel of inactive enterprise template
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     And I follow "Inactive enterprise template"
     Then I should be on Inactive Enterprise template's control panel
 
   Scenario: Go to control panel of community template
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     And I follow "Community template"
     Then I should be on Community template's control panel
 
@@ -46,7 +46,7 @@ Feature: edit environment templates
     Given that the default environment have no Inactive Enterprise template
     And I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit Templates"
+    And I follow "Profile templates"
     Then I should see "Person template" link
     And I should see "Community template" link
     And I should see "Enterprise template" link
diff --git a/features/environment_name.feature b/features/environment_name.feature
index a0f2ec9..2ebf87e 100644
--- a/features/environment_name.feature
+++ b/features/environment_name.feature
@@ -6,7 +6,7 @@ Feature: setting environment name
   Scenario: setting environment name through administration panel
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Edit environment settings"
+    And I follow "Environment settings"
     And I fill in "Site name" with "My environment"
     And I press "Save"
     Then I should see "My environment" within "title"
diff --git a/features/export_users.feature b/features/export_users.feature
index e374f58..5612b1c 100644
--- a/features/export_users.feature
+++ b/features/export_users.feature
@@ -10,14 +10,14 @@ Feature: export users
   Scenario: Export users as XML
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "[XML]"
     Then I should see "ultraje"
 
   Scenario: Export users as CSV
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "[CSV]"
     Then I should see "name;email"
     And I should see "ultraje"
diff --git a/features/manage_categories.feature b/features/manage_categories.feature
index 0bc9be2..d32a72d 100644
--- a/features/manage_categories.feature
+++ b/features/manage_categories.feature
@@ -14,7 +14,7 @@ Feature: manage categories
       | Development   | services  |
     And I am logged in as admin
     And I am on the environment control panel
-    And I follow "Manage categories"
+    And I follow "Categories"
 
   Scenario: load only top level categories
     Then I should see "Products"
diff --git a/features/plugins.feature b/features/plugins.feature
index 0ed7d1f..035e8bf 100644
--- a/features/plugins.feature
+++ b/features/plugins.feature
@@ -49,7 +49,7 @@ Feature: plugins
     When I go to the profile
     Then I should see "Test plugin tab"
     And I go to the environment control panel
-    And I follow "Enable/disable plugins"
+    And I follow "Plugins"
     And I uncheck "Test plugin"
     And I press "Save changes"
     When I go to the Control panel
diff --git a/features/roles.feature b/features/roles.feature
index 948da17..9c9e6a5 100644
--- a/features/roles.feature
+++ b/features/roles.feature
@@ -5,26 +5,26 @@ Feature: manage roles
   Scenario: create new role
     Given I am logged in as admin
     And I go to the environment control panel
-    And I follow "Manage User roles"
+    And I follow "User roles"
     Then I should not see "My new role"
     And I follow "Create a new role"
     And I fill in "Name" with "My new role"
     And I check "Publish content"
     And I press "Create role"
     And I go to the environment control panel
-    And I follow "Manage User roles"
+    And I follow "User roles"
     Then I should see "My new role"
 
   Scenario: edit a role
     Given I am logged in as admin
     And I go to the environment control panel
-    And I follow "Manage User roles"
+    And I follow "User roles"
     Then I should not see "My new role"
     And I follow "Profile Administrator"
     And I follow "Edit"
     And I fill in "Name" with "My new role"
     And I press "Save changes"
     And I go to the environment control panel
-    And I follow "Manage User roles"
+    And I follow "User roles"
     Then I should see "My new role"
     And I should not see "Profile Administrator"
diff --git a/features/send_email_to_environment_members.feature b/features/send_email_to_environment_members.feature
index 0140ff3..f8706fa 100644
--- a/features/send_email_to_environment_members.feature
+++ b/features/send_email_to_environment_members.feature
@@ -18,7 +18,7 @@ Feature: send emails to environment members users
   Scenario: Send e-mail to members
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "Send e-mail to users"
     And I fill in "Subject" with "Hello, user!"
     And I fill in "body" with "We have some news"
@@ -28,7 +28,7 @@ Feature: send emails to environment members users
   Scenario: Not send e-mail to members if subject is blank
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "Send e-mail to users"
     And I fill in "body" with "We have some news"
     When I press "Send"
@@ -37,7 +37,7 @@ Feature: send emails to environment members users
   Scenario: Not send e-mail to members if body is blank
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "Send e-mail to users"
     And I fill in "Subject" with "Hello, user!"
     When I press "Send"
@@ -46,7 +46,7 @@ Feature: send emails to environment members users
   Scenario: Cancel creation of mailing
     Given I am logged in as admin
     When I follow "Administration"
-    And I follow "Manage users"
+    And I follow "Users"
     And I follow "Send e-mail to users"
     Then I should be on /admin/users/send_mail
     When I follow "Cancel e-mail"
--
libgit2 0.21.2