diff --git a/features/blog.feature b/features/blog.feature
index 26b3b0e..d228a4d 100644
--- a/features/blog.feature
+++ b/features/blog.feature
@@ -11,16 +11,16 @@ Feature: blog
     And I am logged in as "joaosilva"
 
   Scenario: create a blog
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Create blog"
     Then I should see "My Blog"
     When I fill in "Title" with "My Blog"
     And I press "Save"
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     Then I should see "Configure blog"
 
   Scenario: redirect to blog after create blog from control panel
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Create blog"
     Then I should see "My Blog"
     When I fill in "Title" with "My Blog"
@@ -28,7 +28,7 @@ Feature: blog
     Then I should be on /joaosilva/my-blog
 
   Scenario: redirect to blog after create blog from cms
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Blog"
@@ -37,13 +37,13 @@ Feature: blog
     Then I should be on /joaosilva/blog-from-cms
 
   Scenario: create multiple blogs
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
     And I fill in "Title" with "Blog One"
     And I press "Save"
-    Then I go to the Control panel
+    Then I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
@@ -53,7 +53,7 @@ Feature: blog
     And I should be on /joaosilva/blog-two
 
   Scenario: cancel button back to cms
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
@@ -61,7 +61,7 @@ Feature: blog
     Then I should be on /myprofile/joaosilva/cms
 
   Scenario: cancel button back to myprofile
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Create blog"
     When I follow "Cancel" within ".main-block"
     Then I should be on /myprofile/joaosilva
@@ -71,7 +71,7 @@ Feature: blog
       | owner     | name     |
       | joaosilva | Blog One |
       | joaosilva | Blog Two |
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     When I follow "Configure blog"
     Then I should be on /myprofile/joaosilva/cms
 
@@ -79,7 +79,7 @@ Feature: blog
     Given the following blogs
        | owner     | name     |
        | joaosilva | Blog One |
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     When I follow "Configure blog"
     Then I should be on edit "Blog One" by joaosilva
 
@@ -89,14 +89,14 @@ Feature: blog
        | owner     | name     |
        | joaosilva | Blog One |
     And I go to /joaosilva/blog-one
-    When I follow "Configure blog" and wait
+    When I follow "Configure blog"
     Then I should be on edit "Blog One" by joaosilva
 
   Scenario: change address of blog
     Given the following blogs
       | owner     | name     |
       | joaosilva | Blog One |
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     And I follow "Configure blog"
     And I fill in "Address" with "blog-two"
     And I press "Save"
@@ -104,7 +104,7 @@ Feature: blog
     Then I should see "Blog One"
 
   Scenario: display tag list field when creating new blog
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Blog"
--
libgit2 0.21.2