diff --git a/doc/swagger.yml b/doc/swagger.yml
index 39f1890b4..7cc129162 100644
--- a/doc/swagger.yml
+++ b/doc/swagger.yml
@@ -452,7 +452,7 @@ paths:
             security:
                 - {}
                 -   bearerAuth: []
-    /{channelCode}/taxon-products/by-slug/{slug}:
+    /{channelCode}/taxon-products/by-slug/{taxonSlug}:
         parameters:
             -   $ref: "#/parameters/ChannelCode"
         get:
@@ -462,7 +462,7 @@ paths:
             description: "This endpoint will return a paginated list of products for given taxon."
             operationId: "productCatalogBySlug"
             parameters:
-                -   name: "slug"
+                -   name: "taxonSlug"
                     in: "path"
                     description: "Slug of taxonomy for which products should be listed."
                     required: true
@@ -487,7 +487,7 @@ paths:
                     description: "Paginated product list."
                     schema:
                         $ref: "#/definitions/ProductsPage"
-    /{channelCode}/taxon-products-by-slug/{slug}:
+    /{channelCode}/taxon-products-by-slug/{taxonSlug}:
         parameters:
             -   $ref: "#/parameters/ChannelCode"
         get:
@@ -498,7 +498,7 @@ paths:
             description: "This endpoint will return a paginated list of products for given taxon."
             operationId: "productCatalogBySlug_deprecated"
             parameters:
-                -   name: "slug"
+                -   name: "taxonSlug"
                     in: "path"
                     description: "Slug of taxonomy for which products should be listed."
                     required: true
diff --git a/src/Controller/Product/ShowProductCatalogByTaxonSlugAction.php b/src/Controller/Product/ShowProductCatalogByTaxonSlugAction.php
index ce2eee081..1dfcf4cb2 100644
--- a/src/Controller/Product/ShowProductCatalogByTaxonSlugAction.php
+++ b/src/Controller/Product/ShowProductCatalogByTaxonSlugAction.php
@@ -32,7 +32,7 @@ public function __invoke(Request $request): Response
     {
         try {
             return $this->viewHandler->handle(View::create($this->productCatalogQuery->findByTaxonSlug(
-                $request->attributes->get('slug'),
+                $request->attributes->get('taxonSlug'),
                 $request->attributes->get('channelCode'),
                 new PaginatorDetails($request->attributes->get('_route'), $request->query->all()),
                 $request->query->get('locale')
diff --git a/src/Resources/config/routing/productByCode.yml b/src/Resources/config/routing/productByCode.yml
index 623da66f9..6bca368b3 100644
--- a/src/Resources/config/routing/productByCode.yml
+++ b/src/Resources/config/routing/productByCode.yml
@@ -1,26 +1,26 @@
-sylius_shop_api_product_show_details_by_code_deprecated:
-    path: /products/{code}
-    methods: [GET]
-    defaults:
-        _controller: sylius.shop_api_plugin.controller.product.show_product_details_by_code_action
-
-sylius_shop_api_product_show_catalog_by_code_deprecated:
-    path: /taxon-products/{code}
-    methods: [GET]
-    defaults:
-        _controller: sylius.shop_api_plugin.controller.product.show_product_catalog_by_taxon_code_action
-
-sylius_shop_api_product_show_reviews_by_code_depricated:
-    path: /products/{code}/reviews
-    methods: [GET]
-    defaults:
-        _controller: sylius.shop_api_plugin.controller.product.show_product_reviews_by_code_action
-
-sylius_shop_api_add_product_review_by_code_deprecated:
-    path: /products/{code}/reviews
-    methods: [POST]
-    defaults:
-        _controller: sylius.shop_api_plugin.controller.product.add_review_by_code_action
+#sylius_shop_api_product_show_details_by_code_deprecated:
+#    path: /products/{code}
+#    methods: [GET]
+#    defaults:
+#        _controller: sylius.shop_api_plugin.controller.product.show_product_details_by_code_action
+#
+#sylius_shop_api_product_show_catalog_by_code_deprecated:
+#    path: /taxon-products/{code}
+#    methods: [GET]
+#    defaults:
+#        _controller: sylius.shop_api_plugin.controller.product.show_product_catalog_by_taxon_code_action
+#
+#sylius_shop_api_product_show_reviews_by_code_depricated:
+#    path: /products/{code}/reviews
+#    methods: [GET]
+#    defaults:
+#        _controller: sylius.shop_api_plugin.controller.product.show_product_reviews_by_code_action
+#
+#sylius_shop_api_add_product_review_by_code_deprecated:
+#    path: /products/{code}/reviews
+#    methods: [POST]
+#    defaults:
+#        _controller: sylius.shop_api_plugin.controller.product.add_review_by_code_action
 
 # New routes
 sylius_shop_api_product_show_details_by_code:
diff --git a/src/Resources/config/routing/productBySlug.yml b/src/Resources/config/routing/productBySlug.yml
index 4b495d6e2..6c66026d7 100644
--- a/src/Resources/config/routing/productBySlug.yml
+++ b/src/Resources/config/routing/productBySlug.yml
@@ -1,28 +1,26 @@
-sylius_shop_api_product_show_details_by_slug_deprecated:
-    path: /products-by-slug/{slug}
-    methods: [GET]
-    defaults:
-        _controller: 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController:urlRedirectAction'
-        path: /shop-api/{channelCode}/products/by-slug/{slug}
-        permanent: true
-
-sylius_shop_api_add_product_review_by_slug_deprecated:
-    path: /product-reviews-by-slug/{slug}
-    methods: [POST]
-    defaults:
-        _controller: sylius.shop_api_plugin.controller.product.add_review_by_slug_action
-
-sylius_shop_api_product_show_catalog_by_slug_deprecated:
-    path: /taxon-products-by-slug/{taxonSlug}
-    methods: [GET]
-    defaults:
-        _controller: sylius.shop_api_plugin.controller.product.show_product_catalog_by_taxon_slug_action
-
-sylius_shop_api_product_show_reviews_by_slug_deprecated:
-    path: /product-reviews-by-slug/{slug}
-    methods: [GET]
-    defaults:
-        _controller: sylius.shop_api_plugin.controller.product.show_product_reviews_by_slug_action
+#sylius_shop_api_product_show_details_by_slug_deprecated:
+#    path: /products-by-slug/{slug}
+#    methods: [GET]
+#    defaults:
+#        _controller: sylius.shop_api_plugin.controller.product.show_product_details_by_slug_action
+#
+#sylius_shop_api_add_product_review_by_slug_deprecated:
+#    path: /product-reviews-by-slug/{slug}
+#    methods: [POST]
+#    defaults:
+#        _controller: sylius.shop_api_plugin.controller.product.add_review_by_slug_action
+#
+#sylius_shop_api_product_show_catalog_by_slug_deprecated:
+#    path: /taxon-products-by-slug/{taxonSlug}
+#    methods: [GET]
+#    defaults:
+#        _controller: sylius.shop_api_plugin.controller.product.show_product_catalog_by_taxon_slug_action
+#
+#sylius_shop_api_product_show_reviews_by_slug_deprecated:
+#    path: /product-reviews-by-slug/{slug}
+#    methods: [GET]
+#    defaults:
+#        _controller: sylius.shop_api_plugin.controller.product.show_product_reviews_by_slug_action
 
 # New routes
 sylius_shop_api_product_show_details_by_slug:
@@ -30,21 +28,29 @@ sylius_shop_api_product_show_details_by_slug:
     methods: [GET]
     defaults:
         _controller: sylius.shop_api_plugin.controller.product.show_product_details_by_slug_action
+    requirements:
+        slug: .+
 
 sylius_shop_api_product_show_catalog_by_slug:
-    path: /taxon-products/by-slug/{slug}
+    path: /taxon-products/by-slug/{taxonSlug}
     methods: [GET]
     defaults:
         _controller: sylius.shop_api_plugin.controller.product.show_product_catalog_by_taxon_slug_action
+    requirements:
+        taxonSlug: .+
 
 sylius_shop_api_product_show_reviews_by_slug:
     path: /product/by-slug/{slug}/reviews
     methods: [GET]
     defaults:
         _controller: sylius.shop_api_plugin.controller.product.show_product_reviews_by_slug_action
+    requirements:
+        slug: .+
 
 sylius_shop_api_add_product_review_by_slug:
     path: /product/by-slug/{slug}/reviews
     methods: [POST]
     defaults:
         _controller: sylius.shop_api_plugin.controller.product.add_review_by_slug_action
+    requirements:
+        slug: .+
diff --git a/tests/Controller/Product/ProductAddReviewByCodeApiTest.php b/tests/Controller/Product/ProductAddReviewByCodeApiTest.php
index 6394d5c35..62268b272 100644
--- a/tests/Controller/Product/ProductAddReviewByCodeApiTest.php
+++ b/tests/Controller/Product/ProductAddReviewByCodeApiTest.php
@@ -25,7 +25,7 @@ public function it_adds_review_to_product(): void
             "email": "oliver@example.com"
         }
 EOT;
-        $this->client->request('POST', '/shop-api/WEB_GB/products/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/WEB_GB/products/by-code/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
         $response = $this->client->getResponse();
 
         $this->assertResponseCode($response, Response::HTTP_CREATED);
@@ -47,7 +47,7 @@ public function it_adds_review_to_the_product_for_registered_user(): void
             "email": "oliver@example.com"
         }
 EOT;
-        $this->client->request('POST', '/shop-api/WEB_GB/products/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/WEB_GB/products/by-code/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
         $response = $this->client->getResponse();
 
         $this->assertResponseCode($response, Response::HTTP_CREATED);
@@ -69,7 +69,7 @@ public function it_does_not_allow_to_add_product_review_by_code_in_non_existent_
             "email": "oliver@example.com"
         }
 EOT;
-        $this->client->request('POST', '/shop-api/SPACE_KLINGON/products/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/SPACE_KLINGON/products/by-code/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
@@ -93,7 +93,7 @@ public function it_does_not_allow_to_add_review_when_rating_is_out_of_bounds():
         }
 EOT;
 
-        $this->client->request('POST', '/shop-api/WEB_GB/products/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/WEB_GB/products/by-code/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
 
         $response = $this->client->getResponse();
         $this->assertResponse($response, 'reviews/add_review_failed_rating', Response::HTTP_BAD_REQUEST);
@@ -117,7 +117,7 @@ public function it_does_not_allow_to_add_review_when_email_is_not_valid(): void
         }
 EOT;
 
-        $this->client->request('POST', '/shop-api/WEB_GB/products/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/WEB_GB/products/by-code/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
 
         $response = $this->client->getResponse();
         $this->assertResponse($response, 'reviews/add_review_failed_email', Response::HTTP_BAD_REQUEST);
diff --git a/tests/Controller/Product/ProductAddReviewBySlugApiTest.php b/tests/Controller/Product/ProductAddReviewBySlugApiTest.php
index fce80a6f9..5f7627902 100644
--- a/tests/Controller/Product/ProductAddReviewBySlugApiTest.php
+++ b/tests/Controller/Product/ProductAddReviewBySlugApiTest.php
@@ -25,7 +25,7 @@ public function it_adds_review_to_product(): void
             "email": "oliver@example.com"
         }
 EOT;
-        $this->client->request('POST', '/shop-api/WEB_GB/product-reviews-by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/WEB_GB/product/by-slug/logan-mug/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
         $response = $this->client->getResponse();
 
         $this->assertResponseCode($response, Response::HTTP_CREATED);
@@ -47,7 +47,7 @@ public function it_adds_review_to_the_product_for_registered_user(): void
             "email": "oliver@example.com"
         }
 EOT;
-        $this->client->request('POST', '/shop-api/WEB_GB/product-reviews-by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/WEB_GB/product/by-slug/logan-mug/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
         $response = $this->client->getResponse();
 
         $this->assertResponseCode($response, Response::HTTP_CREATED);
@@ -69,7 +69,7 @@ public function it_does_not_allow_to_add_product_review_by_slug_in_non_existent_
             "email": "oliver@example.com"
         }
 EOT;
-        $this->client->request('POST', '/shop-api/SPACE_KLINGON/product-reviews-by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/SPACE_KLINGON/product/by-slug/logan-mug/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
@@ -92,7 +92,7 @@ public function it_does_not_allow_to_add_review_when_rating_is_out_of_bounds():
         }
 EOT;
 
-        $this->client->request('POST', '/shop-api/WEB_GB/product-reviews-by-slug/mug', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/WEB_GB/product/by-slug/mug/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
 
         $response = $this->client->getResponse();
         $this->assertResponse($response, 'reviews/add_review_failed_rating', Response::HTTP_BAD_REQUEST);
@@ -115,7 +115,7 @@ public function it_does_not_allow_to_add_review_when_rating_email_is_not_valid()
         }
 EOT;
 
-        $this->client->request('POST', '/shop-api/WEB_GB/product-reviews-by-slug/mug', [], [], self::CONTENT_TYPE_HEADER, $data);
+        $this->client->request('POST', '/shop-api/WEB_GB/product/by-slug/mug/reviews', [], [], self::CONTENT_TYPE_HEADER, $data);
 
         $response = $this->client->getResponse();
         $this->assertResponse($response, 'reviews/add_review_failed_email', Response::HTTP_BAD_REQUEST);
diff --git a/tests/Controller/Product/ProductShowCatalogByCodeApiTest.php b/tests/Controller/Product/ProductShowCatalogByCodeApiTest.php
index 4e4868692..991d2d797 100644
--- a/tests/Controller/Product/ProductShowCatalogByCodeApiTest.php
+++ b/tests/Controller/Product/ProductShowCatalogByCodeApiTest.php
@@ -16,7 +16,7 @@ public function it_shows_paginated_products_from_some_taxon_by_code(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/BRAND', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-code/BRAND', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_list_page_by_code_response', Response::HTTP_OK);
@@ -29,7 +29,7 @@ public function it_shows_products_for_sub_taxons_by_code(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/WOMEN_T_SHIRTS', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-code/WOMEN_T_SHIRTS', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_t_shirt_list_page_by_code_response', Response::HTTP_OK);
@@ -42,7 +42,7 @@ public function it_shows_paginated_products_from_some_taxon_by_code_in_different
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/BRAND?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-code/BRAND?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/german_product_list_page_by_code_response', Response::HTTP_OK);
@@ -55,7 +55,7 @@ public function it_shows_second_page_of_paginated_products_from_some_taxon_by_co
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/BRAND?limit=1&page=2', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-code/BRAND?limit=1&page=2', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/limited_product_list_page_by_code_response', Response::HTTP_OK);
@@ -68,7 +68,7 @@ public function it_does_not_show_product_catalog_by_code_in_non_existent_channel
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/SPACE_KLINGON/taxon-products/BRAND', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/SPACE_KLINGON/taxon-products/by-code/BRAND', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
diff --git a/tests/Controller/Product/ProductShowCatalogBySlugApiTest.php b/tests/Controller/Product/ProductShowCatalogBySlugApiTest.php
index af6435f1f..a6a2d3152 100644
--- a/tests/Controller/Product/ProductShowCatalogBySlugApiTest.php
+++ b/tests/Controller/Product/ProductShowCatalogBySlugApiTest.php
@@ -16,7 +16,7 @@ public function it_shows_paginated_products_from_some_taxon_by_slug(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products-by-slug/brands', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-slug/brands', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_list_page_by_slug_response', Response::HTTP_OK);
@@ -29,7 +29,7 @@ public function it_shows_products_for_sub_taxons_by_slug(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products-by-slug/categories/t-shirts/women-t-shirts', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-slug/categories/t-shirts/women-t-shirts', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_t_shirt_list_page_by_slug_response', Response::HTTP_OK);
@@ -42,7 +42,7 @@ public function it_shows_paginated_products_from_some_taxon_by_slug_in_different
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products-by-slug/marken?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-slug/marken?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/german_product_list_page_by_slug_response', Response::HTTP_OK);
@@ -55,7 +55,7 @@ public function it_shows_second_page_of_paginated_products_from_some_taxon_by_sl
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products-by-slug/brands?limit=1&page=2', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-slug/brands?limit=1&page=2', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/limited_product_list_page_by_slug_response', Response::HTTP_OK);
@@ -68,7 +68,7 @@ public function it_shows_sorted_product_list(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products-by-slug/x-man?sorting[createdAt]=desc', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-slug/x-man?sorting[createdAt]=desc', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_list_page_by_slug_response', Response::HTTP_OK);
@@ -81,7 +81,7 @@ public function it_expose_only_some_of_products_in_the_list(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products-by-slug/x-man?criteria[search][value]=Logans+Hat', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/taxon-products/by-slug/x-man?criteria[search][value]=Logans+Hat', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_list_page_by_slug_response', Response::HTTP_OK);
@@ -94,7 +94,7 @@ public function it_does_not_show_product_catalog_by_slug_in_non_existent_channel
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/SPACE_KLINGON/taxon-products-by-slug/brands', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/SPACE_KLINGON/taxon-products/by-slug/brands', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
diff --git a/tests/Controller/Product/ProductShowDetailsByCodeApiTest.php b/tests/Controller/Product/ProductShowDetailsByCodeApiTest.php
index 1c0f19caf..56c345c5c 100644
--- a/tests/Controller/Product/ProductShowDetailsByCodeApiTest.php
+++ b/tests/Controller/Product/ProductShowDetailsByCodeApiTest.php
@@ -16,7 +16,7 @@ public function it_shows_simple_product_details_page(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products/LOGAN_MUG_CODE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-code/LOGAN_MUG_CODE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/simple_product_details_page', Response::HTTP_OK);
@@ -27,7 +27,7 @@ public function it_shows_simple_product_details_page(): void
      */
     public function it_throws_a_not_found_exception_if_channel_has_not_been_found(): void
     {
-        $this->client->request('GET', '/shop-api/WEB_GB/products/LOGAN_MUG_CODE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-code/LOGAN_MUG_CODE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
@@ -40,7 +40,7 @@ public function it_throws_a_not_found_exception_if_product_has_not_been_found():
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products/WRONG_PRODUCT_CODE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-code/WRONG_PRODUCT_CODE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_has_not_been_found_for_given_code_response', Response::HTTP_NOT_FOUND);
@@ -53,7 +53,7 @@ public function it_shows_simple_product_details_page_in_different_locale(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products/LOGAN_MUG_CODE?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-code/LOGAN_MUG_CODE?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/german_simple_product_details_page', Response::HTTP_OK);
@@ -66,7 +66,7 @@ public function it_shows_product_with_variant_details_page(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products/LOGAN_T_SHIRT_CODE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-code/LOGAN_T_SHIRT_CODE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_with_variant_details_page', Response::HTTP_OK);
@@ -79,7 +79,7 @@ public function it_shows_product_with_options_details_page(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products/LOGAN_HAT_CODE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-code/LOGAN_HAT_CODE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_with_options_details_page', Response::HTTP_OK);
@@ -92,7 +92,7 @@ public function it_shows_product_with_options_details_page_in_different_locale()
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products/LOGAN_HAT_CODE?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-code/LOGAN_HAT_CODE?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/german_product_with_options_details_page', Response::HTTP_OK);
@@ -105,7 +105,7 @@ public function it_does_not_show_product_details_by_code_in_non_existent_channel
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/SPACE_KLINGON/products/LOGAN_MUG_CODE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/SPACE_KLINGON/products/by-code/LOGAN_MUG_CODE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
diff --git a/tests/Controller/Product/ProductShowDetailsBySlugApiTest.php b/tests/Controller/Product/ProductShowDetailsBySlugApiTest.php
index 891461891..efb45d21e 100644
--- a/tests/Controller/Product/ProductShowDetailsBySlugApiTest.php
+++ b/tests/Controller/Product/ProductShowDetailsBySlugApiTest.php
@@ -16,7 +16,7 @@ public function it_shows_simple_product_details_page(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products-by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/simple_product_details_page', Response::HTTP_OK);
@@ -29,7 +29,7 @@ public function it_shows_product_without_taxon_details_page(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products-by-slug/logan-shoes', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-slug/logan-shoes', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_without_taxons_details_page', Response::HTTP_OK);
@@ -40,7 +40,7 @@ public function it_shows_product_without_taxon_details_page(): void
      */
     public function it_throws_a_not_found_exception_if_channel_has_not_been_found(): void
     {
-        $this->client->request('GET', '/shop-api/WEB_GB/products-by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
@@ -53,7 +53,7 @@ public function it_throws_a_not_found_exception_if_product_has_not_been_found():
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products-by-slug/some-weird-stuff', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-slug/some-weird-stuff', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_has_not_been_found_for_given_slug_response', Response::HTTP_NOT_FOUND);
@@ -66,7 +66,7 @@ public function it_shows_simple_product_details_page_in_different_locale(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products-by-slug/logan-becher?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-slug/logan-becher?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/german_simple_product_details_page', Response::HTTP_OK);
@@ -79,7 +79,7 @@ public function it_shows_product_with_variant_details_page(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products-by-slug/logan-t-shirt', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-slug/logan-t-shirt', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_with_variant_details_page', Response::HTTP_OK);
@@ -92,7 +92,7 @@ public function it_shows_product_with_options_details_page(): void
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products-by-slug/logan-hat', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-slug/logan-hat', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_with_options_details_page', Response::HTTP_OK);
@@ -105,7 +105,7 @@ public function it_shows_product_with_options_details_page_in_different_locale()
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products-by-slug/logan-hut?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-slug/logan-hut?locale=de_DE', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/german_product_with_options_details_page', Response::HTTP_OK);
@@ -118,7 +118,7 @@ public function it_does_not_show_product_details_by_slug_in_non_existent_channel
     {
         $this->loadFixturesFromFiles(['shop.yml']);
 
-        $this->client->request('GET', '/shop-api/SPACE_KLINGON/products-by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/SPACE_KLINGON/products/by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
diff --git a/tests/Controller/Product/ProductShowReviewsByCodeApiTest.php b/tests/Controller/Product/ProductShowReviewsByCodeApiTest.php
index 370845375..d144bdbf9 100644
--- a/tests/Controller/Product/ProductShowReviewsByCodeApiTest.php
+++ b/tests/Controller/Product/ProductShowReviewsByCodeApiTest.php
@@ -16,7 +16,7 @@ public function it_shows_reviews_for_product_by_slug(): void
     {
         $this->loadFixturesFromFiles(['shop.yml', 'customer.yml', 'mug_review.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/products/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/products/by-code/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_review_list_page_by_code_response', Response::HTTP_OK);
@@ -29,7 +29,7 @@ public function it_does_not_show_product_reviews_by_code_in_non_existent_channel
     {
         $this->loadFixturesFromFiles(['channel.yml']);
 
-        $this->client->request('GET', '/shop-api/SPACE_KLINGON/products/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/SPACE_KLINGON/products/by-code/LOGAN_MUG_CODE/reviews', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
diff --git a/tests/Controller/Product/ProductShowReviewsBySlugApiTest.php b/tests/Controller/Product/ProductShowReviewsBySlugApiTest.php
index 257a34077..2f4245097 100644
--- a/tests/Controller/Product/ProductShowReviewsBySlugApiTest.php
+++ b/tests/Controller/Product/ProductShowReviewsBySlugApiTest.php
@@ -16,7 +16,7 @@ public function it_shows_reviews_for_product_by_slug(): void
     {
         $this->loadFixturesFromFiles(['shop.yml', 'customer.yml', 'mug_review.yml']);
 
-        $this->client->request('GET', '/shop-api/WEB_GB/product-reviews-by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/WEB_GB/product/by-slug/logan-mug/reviews', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'product/product_review_list_page_by_slug_response', Response::HTTP_OK);
@@ -29,7 +29,7 @@ public function it_does_not_show_product_reviews_by_slug_in_non_existent_channel
     {
         $this->loadFixturesFromFiles(['channel.yml']);
 
-        $this->client->request('GET', '/shop-api/SPACE_KLINGON/product-reviews-by-slug/logan-mug', [], [], self::CONTENT_TYPE_HEADER);
+        $this->client->request('GET', '/shop-api/SPACE_KLINGON/product/by-slug/logan-mug/reviews', [], [], self::CONTENT_TYPE_HEADER);
         $response = $this->client->getResponse();
 
         $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
diff --git a/tests/Responses/Expected/product/german_product_list_page_by_code_response.json b/tests/Responses/Expected/product/german_product_list_page_by_code_response.json
index 44a3c30a0..41ec2a00b 100644
--- a/tests/Responses/Expected/product/german_product_list_page_by_code_response.json
+++ b/tests/Responses/Expected/product/german_product_list_page_by_code_response.json
@@ -4,10 +4,10 @@
     "pages": 1,
     "total": 2,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?locale=de_DE&page=1&limit=10",
-        "first": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?locale=de_DE&page=1&limit=10",
-        "last": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?locale=de_DE&page=1&limit=10",
-        "next": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?locale=de_DE&page=1&limit=10"
+        "self": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?locale=de_DE&page=1&limit=10",
+        "first": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?locale=de_DE&page=1&limit=10",
+        "last": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?locale=de_DE&page=1&limit=10",
+        "next": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?locale=de_DE&page=1&limit=10"
     },
     "items": [
         {
diff --git a/tests/Responses/Expected/product/german_product_list_page_by_slug_response.json b/tests/Responses/Expected/product/german_product_list_page_by_slug_response.json
index 56eb5f95b..bed1c81b1 100644
--- a/tests/Responses/Expected/product/german_product_list_page_by_slug_response.json
+++ b/tests/Responses/Expected/product/german_product_list_page_by_slug_response.json
@@ -4,10 +4,10 @@
     "pages": 1,
     "total": 2,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/marken?locale=de_DE&page=1&limit=10",
-        "first": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/marken?locale=de_DE&page=1&limit=10",
-        "last": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/marken?locale=de_DE&page=1&limit=10",
-        "next": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/marken?locale=de_DE&page=1&limit=10"
+        "self": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/marken?locale=de_DE&page=1&limit=10",
+        "first": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/marken?locale=de_DE&page=1&limit=10",
+        "last": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/marken?locale=de_DE&page=1&limit=10",
+        "next": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/marken?locale=de_DE&page=1&limit=10"
     },
     "items": [
         {
diff --git a/tests/Responses/Expected/product/limited_product_list_page_by_code_response.json b/tests/Responses/Expected/product/limited_product_list_page_by_code_response.json
index f8ccaa5d5..e544c5fd6 100644
--- a/tests/Responses/Expected/product/limited_product_list_page_by_code_response.json
+++ b/tests/Responses/Expected/product/limited_product_list_page_by_code_response.json
@@ -4,10 +4,10 @@
     "pages": 3,
     "total": 3,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?limit=1&page=2",
-        "first": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?limit=1&page=1",
-        "last": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?limit=1&page=3",
-        "next": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?limit=1&page=3"
+        "self": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?limit=1&page=2",
+        "first": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?limit=1&page=1",
+        "last": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?limit=1&page=3",
+        "next": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?limit=1&page=3"
     },
     "items": [
         {
diff --git a/tests/Responses/Expected/product/limited_product_list_page_by_slug_response.json b/tests/Responses/Expected/product/limited_product_list_page_by_slug_response.json
index b4ef473e9..1b2c56c49 100644
--- a/tests/Responses/Expected/product/limited_product_list_page_by_slug_response.json
+++ b/tests/Responses/Expected/product/limited_product_list_page_by_slug_response.json
@@ -4,10 +4,10 @@
     "pages": 3,
     "total": 3,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/brands?limit=1&page=2",
-        "first": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/brands?limit=1&page=1",
-        "last": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/brands?limit=1&page=3",
-        "next": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/brands?limit=1&page=3"
+        "self": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/brands?limit=1&page=2",
+        "first": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/brands?limit=1&page=1",
+        "last": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/brands?limit=1&page=3",
+        "next": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/brands?limit=1&page=3"
     },
     "items": [
         {
diff --git a/tests/Responses/Expected/product/product_list_page_by_code_response.json b/tests/Responses/Expected/product/product_list_page_by_code_response.json
index dff00417d..b574fbdfc 100644
--- a/tests/Responses/Expected/product/product_list_page_by_code_response.json
+++ b/tests/Responses/Expected/product/product_list_page_by_code_response.json
@@ -4,10 +4,10 @@
     "pages": 1,
     "total": 3,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?page=1&limit=10",
-        "first": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?page=1&limit=10",
-        "last": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?page=1&limit=10",
-        "next": "\/shop-api\/WEB_GB\/taxon-products\/BRAND?page=1&limit=10"
+        "self": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?page=1&limit=10",
+        "first": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?page=1&limit=10",
+        "last": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?page=1&limit=10",
+        "next": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/BRAND?page=1&limit=10"
     },
     "items": [
         {
diff --git a/tests/Responses/Expected/product/product_list_page_by_slug_response.json b/tests/Responses/Expected/product/product_list_page_by_slug_response.json
index 35f2a48fc..bcd521a1d 100644
--- a/tests/Responses/Expected/product/product_list_page_by_slug_response.json
+++ b/tests/Responses/Expected/product/product_list_page_by_slug_response.json
@@ -4,10 +4,10 @@
     "pages": 1,
     "total": 3,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/brands?page=1&limit=10",
-        "first": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/brands?page=1&limit=10",
-        "last": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/brands?page=1&limit=10",
-        "next": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/brands?page=1&limit=10"
+        "self": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/brands?page=1&limit=10",
+        "first": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/brands?page=1&limit=10",
+        "last": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/brands?page=1&limit=10",
+        "next": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/brands?page=1&limit=10"
     },
     "items": [
         {
diff --git a/tests/Responses/Expected/product/product_review_list_page_by_code_response.json b/tests/Responses/Expected/product/product_review_list_page_by_code_response.json
index 97d8e9d8b..aa4478f5c 100644
--- a/tests/Responses/Expected/product/product_review_list_page_by_code_response.json
+++ b/tests/Responses/Expected/product/product_review_list_page_by_code_response.json
@@ -4,10 +4,10 @@
     "pages": 3,
     "total": 25,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/products\/LOGAN_MUG_CODE\/reviews?page=1&limit=10",
-        "first": "\/shop-api\/WEB_GB\/products\/LOGAN_MUG_CODE\/reviews?page=1&limit=10",
-        "last": "\/shop-api\/WEB_GB\/products\/LOGAN_MUG_CODE\/reviews?page=3&limit=10",
-        "next": "\/shop-api\/WEB_GB\/products\/LOGAN_MUG_CODE\/reviews?page=2&limit=10"
+        "self": "\/shop-api\/WEB_GB\/products\/by-code\/LOGAN_MUG_CODE\/reviews?page=1&limit=10",
+        "first": "\/shop-api\/WEB_GB\/products\/by-code\/LOGAN_MUG_CODE\/reviews?page=1&limit=10",
+        "last": "\/shop-api\/WEB_GB\/products\/by-code\/LOGAN_MUG_CODE\/reviews?page=3&limit=10",
+        "next": "\/shop-api\/WEB_GB\/products\/by-code\/LOGAN_MUG_CODE\/reviews?page=2&limit=10"
     },
     "items": [
         {
diff --git a/tests/Responses/Expected/product/product_review_list_page_by_slug_response.json b/tests/Responses/Expected/product/product_review_list_page_by_slug_response.json
index 5d2ebb643..146bc5ff8 100644
--- a/tests/Responses/Expected/product/product_review_list_page_by_slug_response.json
+++ b/tests/Responses/Expected/product/product_review_list_page_by_slug_response.json
@@ -4,10 +4,10 @@
     "pages": 3,
     "total": 25,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/product-reviews-by-slug\/logan-mug?page=1&limit=10",
-        "first": "\/shop-api\/WEB_GB\/product-reviews-by-slug\/logan-mug?page=1&limit=10",
-        "last": "\/shop-api\/WEB_GB\/product-reviews-by-slug\/logan-mug?page=3&limit=10",
-        "next": "\/shop-api\/WEB_GB\/product-reviews-by-slug\/logan-mug?page=2&limit=10"
+        "self": "\/shop-api\/WEB_GB\/product\/by-slug\/logan-mug\/reviews?page=1&limit=10",
+        "first": "\/shop-api\/WEB_GB\/product\/by-slug\/logan-mug\/reviews?page=1&limit=10",
+        "last": "\/shop-api\/WEB_GB\/product\/by-slug\/logan-mug\/reviews?page=3&limit=10",
+        "next": "\/shop-api\/WEB_GB\/product\/by-slug\/logan-mug\/reviews?page=2&limit=10"
     },
     "items": [
         {
diff --git a/tests/Responses/Expected/product/product_t_shirt_list_page_by_code_response.json b/tests/Responses/Expected/product/product_t_shirt_list_page_by_code_response.json
index 94b3c286e..4165cbb1e 100644
--- a/tests/Responses/Expected/product/product_t_shirt_list_page_by_code_response.json
+++ b/tests/Responses/Expected/product/product_t_shirt_list_page_by_code_response.json
@@ -4,10 +4,10 @@
     "pages": 1,
     "total": 1,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/taxon-products\/WOMEN_T_SHIRTS?page=1&limit=10",
-        "first": "\/shop-api\/WEB_GB\/taxon-products\/WOMEN_T_SHIRTS?page=1&limit=10",
-        "last": "\/shop-api\/WEB_GB\/taxon-products\/WOMEN_T_SHIRTS?page=1&limit=10",
-        "next": "\/shop-api\/WEB_GB\/taxon-products\/WOMEN_T_SHIRTS?page=1&limit=10"
+        "self": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/WOMEN_T_SHIRTS?page=1&limit=10",
+        "first": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/WOMEN_T_SHIRTS?page=1&limit=10",
+        "last": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/WOMEN_T_SHIRTS?page=1&limit=10",
+        "next": "\/shop-api\/WEB_GB\/taxon-products\/by-code\/WOMEN_T_SHIRTS?page=1&limit=10"
     },
     "items": [
         {
diff --git a/tests/Responses/Expected/product/product_t_shirt_list_page_by_slug_response.json b/tests/Responses/Expected/product/product_t_shirt_list_page_by_slug_response.json
index 6cbd2b3f5..447c2a932 100644
--- a/tests/Responses/Expected/product/product_t_shirt_list_page_by_slug_response.json
+++ b/tests/Responses/Expected/product/product_t_shirt_list_page_by_slug_response.json
@@ -4,10 +4,10 @@
     "pages": 1,
     "total": 1,
     "_links": {
-        "self": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/categories\/t-shirts\/women-t-shirts?page=1&limit=10",
-        "first": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/categories\/t-shirts\/women-t-shirts?page=1&limit=10",
-        "last": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/categories\/t-shirts\/women-t-shirts?page=1&limit=10",
-        "next": "\/shop-api\/WEB_GB\/taxon-products-by-slug\/categories\/t-shirts\/women-t-shirts?page=1&limit=10"
+        "self": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/categories\/t-shirts\/women-t-shirts?page=1&limit=10",
+        "first": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/categories\/t-shirts\/women-t-shirts?page=1&limit=10",
+        "last": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/categories\/t-shirts\/women-t-shirts?page=1&limit=10",
+        "next": "\/shop-api\/WEB_GB\/taxon-products\/by-slug\/categories\/t-shirts\/women-t-shirts?page=1&limit=10"
     },
     "items": [
         {