diff --git a/config/services.yaml b/config/services.yaml
index f04a8e2..b7c29a2 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -31,7 +31,7 @@ services:
         arguments:
             $available_currencies: '%app.currencies%'
 
-    App\Service\StubQRCodeGenerator:
+    App\Service\StubQRCodeProvider:
         arguments:
             $imagePath: '%kernel.project_dir%/assets/images/wip.png'
 
@@ -47,7 +47,7 @@ services:
             $retryCount: 2
             $retryWaitSeconds: 0.5
 
-    App\Service\CachedQRCodeGenerator:
+    App\Service\CachedQRCodeProvider:
         arguments:
             $innerGenerator: '@App\Service\Remote\UsetrenoQRCodeProvider'
             $cacheDuration: 'PT60S'
@@ -55,7 +55,7 @@ services:
 
     App\Service\CurrencyListerInterface: '@App\Service\StaticCurrencyLister'
     App\Service\QRCodeQROptionsProviderInterface: '@App\Service\QRCodeQROptionsDefaultProvider'
-    App\Service\QRCodeGeneratorInterface: '@App\Service\CachedQRCodeGenerator'
+    App\Service\QRCodeProviderInterface: '@App\Service\CachedQRCodeProvider'
 
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php
index 0294c20..121de62 100644
--- a/src/Controller/IndexController.php
+++ b/src/Controller/IndexController.php
@@ -5,7 +5,7 @@ namespace App\Controller;
 use App\Entity\Input\QRCode\QRCode;
 use App\Form\Type\QRCodeType;
 use App\Service\DTO\QRCodeEntityConverter;
-use App\Service\QRCodeGeneratorInterface;
+use App\Service\QRCodeProviderInterface;
 use App\Service\QRCodeQROptionsProviderInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -16,8 +16,8 @@ class IndexController extends AbstractController {
     public function __construct(private readonly QRCodeQROptionsProviderInterface $qrCodeQROptionsFactory, private readonly QRCodeEntityConverter $codeEntityConverter) {}
     #[Route('/', name: 'homepage')]
     public function indexAction(
-        Request $request,
-        QRCodeGeneratorInterface $qrCodeGenerator,
+        Request                 $request,
+        QRCodeProviderInterface $qrCodeGenerator,
     ): Response
     {
         $qrCodeImage = null;
diff --git a/src/Service/CacheableQRCodeGeneratorInterface.php b/src/Service/CacheableQRCodeProviderInterface.php
similarity index 73%
rename from src/Service/CacheableQRCodeGeneratorInterface.php
rename to src/Service/CacheableQRCodeProviderInterface.php
index d3ae2a3..2b68be8 100644
--- a/src/Service/CacheableQRCodeGeneratorInterface.php
+++ b/src/Service/CacheableQRCodeProviderInterface.php
@@ -5,7 +5,7 @@ namespace App\Service;
 
 use App\Entity\DTO\QRCode\QRCode;
 
-interface CacheableQRCodeGeneratorInterface extends QRCodeGeneratorInterface
+interface CacheableQRCodeProviderInterface extends QRCodeProviderInterface
 {
     // We can't calculate cache key directly from QRCode
     public function getCacheKey(QRCode $entity): string;
diff --git a/src/Service/CachedQRCodeGenerator.php b/src/Service/CachedQRCodeProvider.php
similarity index 77%
rename from src/Service/CachedQRCodeGenerator.php
rename to src/Service/CachedQRCodeProvider.php
index 6abf9ca..30b25ff 100644
--- a/src/Service/CachedQRCodeGenerator.php
+++ b/src/Service/CachedQRCodeProvider.php
@@ -10,14 +10,14 @@ use Symfony\Contracts\Cache\CacheInterface;
 use Symfony\Contracts\Cache\ItemInterface;
 
 
-final readonly class CachedQRCodeGenerator implements QRCodeGeneratorInterface
+final readonly class CachedQRCodeProvider implements QRCodeProviderInterface
 {
     private \DateInterval $cacheDuration;
 
     /**
      * @throws Exception
      */
-    public function __construct(private CacheableQRCodeGeneratorInterface $innerGenerator, private CacheInterface $cache, private LoggerInterface $logger, string $cacheDuration)
+    public function __construct(private CacheableQRCodeProviderInterface $innerGenerator, private CacheInterface $cache, private LoggerInterface $logger, string $cacheDuration)
     {
         $this->cacheDuration = new \DateInterval($cacheDuration);
     }
diff --git a/src/Service/QRCodeGeneratorInterface.php b/src/Service/QRCodeProviderInterface.php
similarity index 91%
rename from src/Service/QRCodeGeneratorInterface.php
rename to src/Service/QRCodeProviderInterface.php
index f674124..a05d9cc 100644
--- a/src/Service/QRCodeGeneratorInterface.php
+++ b/src/Service/QRCodeProviderInterface.php
@@ -6,7 +6,7 @@ namespace App\Service;
 use App\Entity\DTO\QRCode\QRCode;
 use App\Service\Exception\QRCodeGeneratorException;
 
-interface QRCodeGeneratorInterface
+interface QRCodeProviderInterface
 {
     /**
      * Generates QR code from entity
diff --git a/src/Service/Remote/UsetrenoQRCodeProvider.php b/src/Service/Remote/UsetrenoQRCodeProvider.php
index c824e32..cb7214a 100644
--- a/src/Service/Remote/UsetrenoQRCodeProvider.php
+++ b/src/Service/Remote/UsetrenoQRCodeProvider.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace App\Service\Remote;
 
 use App\Entity\DTO\QRCode\QRCode;
-use App\Service\CacheableQRCodeGeneratorInterface;
+use App\Service\CacheableQRCodeProviderInterface;
 use App\Service\Remote\Edge\QRCodeEntityConverter;
 use App\Service\Remote\Exception\UsetrenoQRCodeException;
 use App\Service\Remote\Exception\UsetrenoQRCodeRemoteServerErrorException;
@@ -12,7 +12,7 @@ use Nubium\Exception\ThisShouldNeverHappenException;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpClient\Exception\TransportException;
 
-class UsetrenoQRCodeProvider implements CacheableQRCodeGeneratorInterface
+class UsetrenoQRCodeProvider implements CacheableQRCodeProviderInterface
 {
     use RetryingFailClientTrait;
 
diff --git a/src/Service/StubQRCodeGenerator.php b/src/Service/StubQRCodeProvider.php
similarity index 85%
rename from src/Service/StubQRCodeGenerator.php
rename to src/Service/StubQRCodeProvider.php
index 1279b00..6713376 100644
--- a/src/Service/StubQRCodeGenerator.php
+++ b/src/Service/StubQRCodeProvider.php
@@ -5,7 +5,7 @@ namespace App\Service;
 
 use App\Entity\DTO\QRCode\QRCode;
 
-readonly final class StubQRCodeGenerator implements QRCodeGeneratorInterface
+readonly final class StubQRCodeProvider implements QRCodeProviderInterface
 {
     public function __construct(private string $imagePath) {}
 
diff --git a/tests/Controller/IndexControllerTest.php b/tests/Controller/IndexControllerTest.php
index 9f98168..7a5be0e 100644
--- a/tests/Controller/IndexControllerTest.php
+++ b/tests/Controller/IndexControllerTest.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace App\Tests\Controller;
 
-use App\Service\QRCodeGeneratorInterface;
+use App\Service\QRCodeProviderInterface;
 use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
@@ -76,7 +76,7 @@ class IndexControllerTest extends WebTestCase
 
     private function generateClientForSubmitTest(): KernelBrowser
     {
-        $mock = $this->createMock(QRCodeGeneratorInterface::class);
+        $mock = $this->createMock(QRCodeProviderInterface::class);
         $mock->expects($this->any())
             ->method('generateQRCodeFromEntity')
             ->will($this->returnValue('foo'));
@@ -85,7 +85,7 @@ class IndexControllerTest extends WebTestCase
         $client = static::createClient();
         $client->disableReboot();
 
-        self::getContainer()->set('App\Service\QRCodeGeneratorInterface', $mock);
+        self::getContainer()->set('App\Service\QRCodeProviderInterface', $mock);
 
         return $client;
     }