diff --git a/src/Sylius/Bundle/AdminBundle/Tests/EventListener/AdminSectionCacheControlSubscriberTest.php b/src/Sylius/Bundle/AdminBundle/Tests/EventListener/AdminSectionCacheControlSubscriberTest.php
index 40201426a2d..41feff738b5 100644
--- a/src/Sylius/Bundle/AdminBundle/Tests/EventListener/AdminSectionCacheControlSubscriberTest.php
+++ b/src/Sylius/Bundle/AdminBundle/Tests/EventListener/AdminSectionCacheControlSubscriberTest.php
@@ -32,7 +32,7 @@ public function it_returns_proper_cache_headers_for_admin_endpoints(): void
     /**
      * @test
      */
-    public function it_returns_normal_headers_otherwise(): void
+    public function it_returns_standard_headers_otherwise(): void
     {
         $client = static::createClient();
 
diff --git a/src/Sylius/Bundle/AdminBundle/spec/EventListener/AdminSectionCacheControlSubscriberSpec.php b/src/Sylius/Bundle/AdminBundle/spec/EventListener/AdminSectionCacheControlSubscriberSpec.php
index adb9d92b0a9..f67decf3f5d 100644
--- a/src/Sylius/Bundle/AdminBundle/spec/EventListener/AdminSectionCacheControlSubscriberSpec.php
+++ b/src/Sylius/Bundle/AdminBundle/spec/EventListener/AdminSectionCacheControlSubscriberSpec.php
@@ -14,12 +14,9 @@
 namespace spec\Sylius\Bundle\AdminBundle\EventListener;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Bundle\AdminBundle\EmailManager\ShipmentEmailManagerInterface;
 use Sylius\Bundle\AdminBundle\SectionResolver\AdminSection;
 use Sylius\Bundle\CoreBundle\SectionResolver\SectionInterface;
 use Sylius\Bundle\CoreBundle\SectionResolver\SectionProviderInterface;
-use Sylius\Component\Core\Model\ShipmentInterface;
-use Symfony\Component\EventDispatcher\GenericEvent;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
@@ -35,7 +32,7 @@ function let(SectionProviderInterface $sectionProvider): void
         $this->beConstructedWith($sectionProvider);
     }
 
-    function it_subscribes_to_kernel_response_event()
+    function it_subscribes_to_kernel_response_event(): void
     {
         $this::getSubscribedEvents()->shouldReturn([KernelEvents::RESPONSE => 'setCacheControlDirectives']);
     }
@@ -67,7 +64,7 @@ function it_adds_cache_control_directives_to_admin_requests(
         $this->setCacheControlDirectives($event);
     }
 
-    function it_does_nothing_if_section_is_different_then_admin(
+    function it_does_nothing_if_section_is_different_than_admin(
         SectionProviderInterface $sectionProvider,
         HttpKernelInterface $kernel,
         Request $request,
diff --git a/src/Sylius/Bundle/ShopBundle/Tests/EventListener/AdminSectionCacheControlSubscriberTest.php b/src/Sylius/Bundle/ShopBundle/Tests/EventListener/ShopCustomerAccountSubSectionCacheControlSubscriberTest.php
similarity index 80%
rename from src/Sylius/Bundle/ShopBundle/Tests/EventListener/AdminSectionCacheControlSubscriberTest.php
rename to src/Sylius/Bundle/ShopBundle/Tests/EventListener/ShopCustomerAccountSubSectionCacheControlSubscriberTest.php
index f1b53199059..0dce7db7fad 100644
--- a/src/Sylius/Bundle/ShopBundle/Tests/EventListener/AdminSectionCacheControlSubscriberTest.php
+++ b/src/Sylius/Bundle/ShopBundle/Tests/EventListener/ShopCustomerAccountSubSectionCacheControlSubscriberTest.php
@@ -11,11 +11,11 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\AdminBundle\Tests\EventListener;
+namespace Sylius\Bundle\ShopBundle\Tests\EventListener;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
-final class AdminSectionCacheControlSubscriberTest extends WebTestCase
+final class ShopCustomerAccountSubSectionCacheControlSubscriberTest extends WebTestCase
 {
     /**
      * @test
@@ -32,7 +32,7 @@ public function it_returns_proper_cache_headers_for_customer_account_endpoints()
     /**
      * @test
      */
-    public function it_returns_normal_headers_otherwise(): void
+    public function it_returns_standard_headers_otherwise(): void
     {
         $client = static::createClient();
 
diff --git a/src/Sylius/Bundle/ShopBundle/spec/EventListener/ShopCustomerAccountSubSectionCacheControlSubscriberSpec.php b/src/Sylius/Bundle/ShopBundle/spec/EventListener/ShopCustomerAccountSubSectionCacheControlSubscriberSpec.php
index 67ac0afa0d3..61fc6e72b81 100644
--- a/src/Sylius/Bundle/ShopBundle/spec/EventListener/ShopCustomerAccountSubSectionCacheControlSubscriberSpec.php
+++ b/src/Sylius/Bundle/ShopBundle/spec/EventListener/ShopCustomerAccountSubSectionCacheControlSubscriberSpec.php
@@ -64,7 +64,7 @@ function it_adds_cache_control_directives_to_customer_account_requests(
         $this->setCacheControlDirectives($event);
     }
 
-    function it_does_nothing_if_section_is_different_then_customer_account(
+    function it_does_nothing_if_section_is_different_than_customer_account(
         SectionProviderInterface $sectionProvider,
         HttpKernelInterface $kernel,
         Request $request,