diff --git a/features/backend/orders.feature b/features/backend/orders.feature
index 78c4166d95..8606802ea8 100644
--- a/features/backend/orders.feature
+++ b/features/backend/orders.feature
@@ -55,17 +55,17 @@ Feature: Orders management
          Then I should be on the order creation page
 
     Scenario: Accessing the order editing form
-        Given I am viewing order with number "000001"
+        Given I am viewing order with number "000000001"
          When I follow "edit"
-         Then I should be editing order with number "000001"
+         Then I should be editing order with number "000000001"
 
     Scenario: Accessing the editing form from the list
         Given I am on the order index page
          When I click "edit" near "#000000002"
-         Then I should be editing order with number "000002"
+         Then I should be editing order with number "000000002"
 
     Scenario: Deleting the order
-        Given I am viewing order with number "000001"
+        Given I am viewing order with number "000000001"
          When I press "delete"
          Then I should be on the order index page
           And I should see "Order has been successfully deleted."
@@ -77,7 +77,7 @@ Feature: Orders management
           And I should see "Order has been successfully deleted."
 
     Scenario: Deleted order disappears from the list
-        Given I am viewing order with number "000002"
+        Given I am viewing order with number "000000002"
          When I press "delete"
          Then I should be on the order index page
           And I should not see order with number "#000000002" in the list
@@ -85,21 +85,21 @@ Feature: Orders management
     Scenario: Accessing the order details page from list
         Given I am on the order index page
          When I click "details" near "#000000001"
-         Then I should be viewing order with number "000001"
+         Then I should be viewing order with number "000000001"
 
     Scenario: Accessing the order details page by clicking the number
         Given I am on the order index page
          When I click "#000000002"
-         Then I should be viewing order with number "000002"
+         Then I should be viewing order with number "000000002"
 
     Scenario: Displaying correct total on order page
-        Given I am viewing order with number "000002"
+        Given I am viewing order with number "000000002"
          Then I should see "Total: €56.57"
 
     Scenario: Displaying correct items total on order page
-        Given I am viewing order with number "000002"
+        Given I am viewing order with number "000000002"
          Then I should see "Items total: €45.99"
 
     Scenario: Displaying correct tax total on order page
-        Given I am viewing order with number "000002"
+        Given I am viewing order with number "000000002"
          Then I should see "Tax total: €10.58"
diff --git a/src/Sylius/Bundle/WebBundle/Behat/DataContext.php b/src/Sylius/Bundle/WebBundle/Behat/DataContext.php
index a78366d139..d0d757d837 100644
--- a/src/Sylius/Bundle/WebBundle/Behat/DataContext.php
+++ b/src/Sylius/Bundle/WebBundle/Behat/DataContext.php
@@ -232,7 +232,7 @@ class DataContext extends BehatContext implements KernelAwareInterface
         $order->calculateTotal();
         $order->complete();
 
-        $this->getService('event_dispatcher')->dispatch('sylius.order.pre_create', new GenericEvent($order));
+        $this->getService('event_dispatcher')->dispatch('sylius.cart_change', new GenericEvent($order));
 
         $manager->persist($order);
         $manager->flush();