diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 20f81a8..68acafa 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -14,6 +14,7 @@
 namespace Sylius\Bundle\ThemeBundle\DependencyInjection;
 
 use Sylius\Bundle\ThemeBundle\Configuration\ConfigurationSourceFactoryInterface;
+use Sylius\Bundle\ThemeBundle\Context\SettableThemeContext;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -42,7 +43,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         $rootNode->children()->arrayNode('assets')->canBeDisabled();
         $rootNode->children()->arrayNode('templating')->canBeDisabled();
         $rootNode->children()->arrayNode('translations')->canBeDisabled();
-        $rootNode->children()->scalarNode('context')->defaultValue('sylius.theme.context.settable')->cannotBeEmpty();
+        $rootNode->children()->scalarNode('context')->defaultValue(SettableThemeContext::class)->cannotBeEmpty();
         $rootNode->children()
             ->booleanNode('legacy_mode')
                 ->defaultFalse()
diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php
index 6ce505e..aada3bf 100644
--- a/src/Resources/config/services.php
+++ b/src/Resources/config/services.php
@@ -18,6 +18,7 @@
 use Sylius\Bundle\ThemeBundle\Context\ThemeContextInterface;
 use Sylius\Bundle\ThemeBundle\HierarchyProvider\ThemeHierarchyProvider;
 use Sylius\Bundle\ThemeBundle\HierarchyProvider\ThemeHierarchyProviderInterface;
+use Sylius\Bundle\ThemeBundle\Loader\ThemeLoaderInterface;
 use Sylius\Bundle\ThemeBundle\Repository\InMemoryThemeRepository;
 use Sylius\Bundle\ThemeBundle\Repository\ThemeRepositoryInterface;
 
@@ -28,7 +29,7 @@
 
     $services->set(ThemeContextInterface::class, EmptyThemeContext::class);
 
-    $services->set(SettableThemeContext::class)->args([service('sylius.theme.hierarchy_provider')]);
+    $services->set(SettableThemeContext::class)->args([service(ThemeHierarchyProviderInterface::class)]);
     $services
         ->alias('sylius.theme.context.settable', SettableThemeContext::class)
         ->deprecate('sylius/theme-bundle', '2.0', '"%alias_id%" service is deprecated since Sylius/ThemeBundle 2.0 and will be removed in 3.0.')
@@ -37,7 +38,7 @@
     $services
         ->set(ThemeRepositoryInterface::class, InMemoryThemeRepository::class)
         ->args([
-            service('sylius.theme.loader'),
+            service(ThemeLoaderInterface::class),
         ])
     ;
     $services
diff --git a/src/Resources/config/services/configuration.php b/src/Resources/config/services/configuration.php
index 14b025e..f912628 100644
--- a/src/Resources/config/services/configuration.php
+++ b/src/Resources/config/services/configuration.php
@@ -32,7 +32,7 @@
     $services
         ->set(ConfigurationProcessorInterface::class, SymfonyConfigurationProcessor::class)
         ->args([
-            service('sylius.theme.configuration'),
+            service(ThemeConfiguration::class),
             inline_service(Processor::class),
         ])
     ;
diff --git a/src/Resources/config/services/debug.php b/src/Resources/config/services/debug.php
index 114e8ee..cd7d553 100644
--- a/src/Resources/config/services/debug.php
+++ b/src/Resources/config/services/debug.php
@@ -15,22 +15,25 @@
 
 use Sylius\Bundle\ThemeBundle\Collector\ThemeCollector;
 use Sylius\Bundle\ThemeBundle\Command\ListCommand;
+use Sylius\Bundle\ThemeBundle\Context\ThemeContextInterface;
+use Sylius\Bundle\ThemeBundle\HierarchyProvider\ThemeHierarchyProviderInterface;
+use Sylius\Bundle\ThemeBundle\Repository\ThemeRepositoryInterface;
 
 return static function (ContainerConfigurator $container): void {
     $services = $container->services();
 
     $services
         ->set(ListCommand::class)
-        ->args([service('sylius.repository.theme')])
+        ->args([service(ThemeRepositoryInterface::class)])
         ->tag('console.command')
     ;
 
     $services
         ->set(ThemeCollector::class)
         ->args([
-            service('sylius.repository.theme'),
-            service('sylius.context.theme'),
-            service('sylius.theme.hierarchy_provider'),
+            service(ThemeRepositoryInterface::class),
+            service(ThemeContextInterface::class),
+            service(ThemeHierarchyProviderInterface::class),
         ])
         ->tag('data_collector', ['template' => '@SyliusTheme/Collector/theme', 'id' => 'sylius_theme'])
     ;
diff --git a/src/Resources/config/services/form.php b/src/Resources/config/services/form.php
index 6566306..75d0cbb 100644
--- a/src/Resources/config/services/form.php
+++ b/src/Resources/config/services/form.php
@@ -15,19 +15,20 @@
 
 use Sylius\Bundle\ThemeBundle\Form\Type\ThemeChoiceType;
 use Sylius\Bundle\ThemeBundle\Form\Type\ThemeNameChoiceType;
+use Sylius\Bundle\ThemeBundle\Repository\ThemeRepositoryInterface;
 
 return static function (ContainerConfigurator $container): void {
     $services = $container->services();
 
     $services
         ->set(ThemeChoiceType::class)
-        ->args([service('sylius.repository.theme')])
+        ->args([service(ThemeRepositoryInterface::class)])
         ->tag('form.type')
     ;
 
     $services
         ->set(ThemeNameChoiceType::class)
-        ->args([service('sylius.repository.theme')])
+        ->args([service(ThemeRepositoryInterface::class)])
         ->tag('form.type')
     ;
 };
diff --git a/tests/Application/TestBundle/Resources/config/services.php b/tests/Application/TestBundle/Resources/config/services.php
index 913c0a8..f3cb81c 100644
--- a/tests/Application/TestBundle/Resources/config/services.php
+++ b/tests/Application/TestBundle/Resources/config/services.php
@@ -13,6 +13,8 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Sylius\Bundle\ThemeBundle\Context\SettableThemeContext;
+use Sylius\Bundle\ThemeBundle\Repository\ThemeRepositoryInterface;
 use Sylius\Bundle\ThemeBundle\Tests\Application\TestBundle\Controller\TemplatingController;
 use Sylius\Bundle\ThemeBundle\Tests\Application\TestBundle\Listener\RequestListener;
 
@@ -29,8 +31,8 @@
     $services
         ->set('test.sylius_theme.request_listener', RequestListener::class)
         ->args([
-            service('sylius.repository.theme'),
-            service('sylius.theme.context.settable'),
+            service(ThemeRepositoryInterface::class),
+            service(SettableThemeContext::class),
         ])
         ->tag('kernel.event_listener', ['event' => 'kernel.request', 'method' => 'onKernelRequest']);
 };
diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php
index 37bfc25..dbffd1c 100644
--- a/tests/DependencyInjection/ConfigurationTest.php
+++ b/tests/DependencyInjection/ConfigurationTest.php
@@ -15,6 +15,7 @@
 
 use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
 use PHPUnit\Framework\TestCase;
+use Sylius\Bundle\ThemeBundle\Context\SettableThemeContext;
 use Sylius\Bundle\ThemeBundle\DependencyInjection\Configuration;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -31,7 +32,7 @@ public function it_has_default_context_service_set(): void
             [
                 [],
             ],
-            ['context' => 'sylius.theme.context.settable'],
+            ['context' => SettableThemeContext::class],
             'context',
         );
     }