diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingProductsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingProductsContext.php
index b9039c26601..b78665d5913 100644
--- a/src/Sylius/Behat/Context/Ui/Admin/ManagingProductsContext.php
+++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingProductsContext.php
@@ -1049,7 +1049,7 @@ public function thereAreNoProductReviews(ProductInterface $product)
     /**
      * @Then this product should( also) have an association :productAssociationType with product :product
      */
-    public function theProductShouldHaveAnAssociationWithProducts(
+    public function theProductShouldHaveAnAssociationWithProduct(
         ProductAssociationTypeInterface $productAssociationType,
         ProductInterface $product,
     ) {
@@ -1072,10 +1072,9 @@ public function theProductShouldHaveAnAssociationWithProducts(
     public function theProductsShouldHaveAnAssociationWithProducts(
         ProductAssociationTypeInterface $productAssociationType,
         array $products,
-    ): void
-    {
+    ): void {
         foreach ($products as $product) {
-            $this->theProductShouldHaveAnAssociationWithProducts($productAssociationType, $product);
+            $this->theProductShouldHaveAnAssociationWithProduct($productAssociationType, $product);
         }
     }
 
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
index 5b34401d683..b2d954a56a1 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
@@ -13,8 +13,7 @@
 
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <imports>
-        <import resource="services/*.xml" />
-        <import resource="services/product/*.xml" />
+        <import resource="services/**/*.xml" />
     </imports>
 
     <parameters>