diff --git a/behat.yml.dist b/behat.yml.dist
index bfaaecb7e1..d4aa85df6c 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -242,6 +242,7 @@ default:
                 - Sylius\Bundle\TaxonomyBundle\Behat\TaxonomyContext
                 - Sylius\Bundle\WebBundle\Behat\WebContext
                 - Sylius\Bundle\MoneyBundle\Behat\MoneyContext
+                - Sylius\Bundle\ChannelBundle\Behat\ChannelContext
             filters:
                 tags: "@reports && ~@javascript"
 
diff --git a/features/backend/dashboard.feature b/features/backend/dashboard.feature
index a08d378390..6e29a05be1 100644
--- a/features/backend/dashboard.feature
+++ b/features/backend/dashboard.feature
@@ -35,6 +35,6 @@ Feature: Store dashboard
         Given I am on the dashboard page
          Then I should see 2 orders in the list
 
-    Scenario: Viewing recent users
+    Scenario: Viewing recent customers
         Given I am on the dashboard page
-         Then I should see 3 users in the list
+         Then I should see 3 customers in the list
diff --git a/features/backend/groups.feature b/features/backend/groups.feature
index f3086ee41e..e0944bb3b2 100644
--- a/features/backend/groups.feature
+++ b/features/backend/groups.feature
@@ -1,5 +1,5 @@
 @users
-Feature: User groups management
+Feature: Customer groups management
     In order to manage customers
     As a store owner
     I want to be able to group them
@@ -51,12 +51,12 @@ Feature: User groups management
          Then I should be on the group index page
           And I should see group with name "Dealers" in the list
 
-    Scenario: Selecting the groups for user
-        Given I am editing user with username "rick@example.com"
+    Scenario: Selecting the groups for customer
+        Given I am editing customer with email "rick@example.com"
          When I select "Retail Customers" from "Groups"
           And I press "Save changes"
-         Then I should be on the page of user with username "rick@example.com"
-          And "User has been successfully updated." should appear on the page
+         Then I should be on the page of customer with email "rick@example.com"
+          And "Customer has been successfully updated." should appear on the page
 
     Scenario: Accessing the editing form from the list
         Given I am on the group index page
diff --git a/features/backend/orders.feature b/features/backend/orders.feature
index f5c4659b4a..c3c7da3d48 100644
--- a/features/backend/orders.feature
+++ b/features/backend/orders.feature
@@ -122,5 +122,5 @@ Feature: Orders management
 
     Scenario: Sorting order table by appropriate column
         Given I am on the order index page
-         When I follow "Customer"
+         When I follow "customer"
          Then I should see table of orders sorted by lastName
\ No newline at end of file
diff --git a/features/user/account/account_orders.feature b/features/user/account/account_orders.feature
index f5a8c9b763..8f8d43886a 100644
--- a/features/user/account/account_orders.feature
+++ b/features/user/account/account_orders.feature
@@ -30,7 +30,7 @@ Feature: User account orders page
         | Book          | 22.50 | 948 |
       And all products assigned to "DEFAULT-WEB" channel
       And the following orders exist:
-        | user                    | shipment                 | address                                                           |
+        | customer                | shipment                 | address                                                           |
         | sylius@example.com      | UPS, shipped, DTBHH380HG | Théophile Morel, 17 avenue Jean Portalis, 33000, Bordeaux, France |
         | ianmurdock@debian.org   | FedEx                    | Ian Murdock, 3569 New York Avenue, CA 92801, San Francisco, USA   |
         | ianmurdock@debian.org   | FedEx                    | Ian Murdock, 3569 New York Avenue, CA 92801, San Francisco, USA   |
diff --git a/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.yml
index bee24db003..529758c121 100644
--- a/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.yml
+++ b/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.yml
@@ -565,7 +565,7 @@ sylius:
         taxes: Taxes
         total: Total
         update_header: Editing order
-        customer: Customer
+        customer: customer
         currency: Currency
         state: State
         immutable_warning: Already shipped orders are immutable.
diff --git a/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Group/index.html.twig b/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Group/index.html.twig
index 3d881facbb..851e26349d 100644
--- a/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Group/index.html.twig
+++ b/src/Sylius/Bundle/WebBundle/Resources/views/Backend/Group/index.html.twig
@@ -15,7 +15,7 @@
 <div class="page-header">
     <div class="actions-menu">
         {{ buttons.create(path('sylius_backend_group_create'), 'sylius.group.create'|trans) }}
-        {{ buttons.manage(path('sylius_backend_user_index'), 'sylius.user.manage'|trans) }}
+        {{ buttons.manage(path('sylius_backend_customer_index'), 'sylius.customer.manage'|trans) }}
     </div>
     <h1><i class="glyphicon glyphicon-home"></i> {{ 'sylius.group.index_header'|trans|raw }}</h1>
 </div>