diff --git a/module/CLI/config/dependencies.config.php b/module/CLI/config/dependencies.config.php
index 1231a9b3..516bbbd4 100644
--- a/module/CLI/config/dependencies.config.php
+++ b/module/CLI/config/dependencies.config.php
@@ -11,6 +11,7 @@ use Laminas\ServiceManager\Factory\InvokableFactory;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdater;
 use Shlinkio\Shlink\Common\Doctrine\NoDbNameConnectionFactory;
 use Shlinkio\Shlink\Core\Service;
+use Shlinkio\Shlink\Core\Tag\TagService;
 use Shlinkio\Shlink\Core\Visit;
 use Shlinkio\Shlink\Installer\Factory\ProcessHelperFactory;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdater;
@@ -78,10 +79,10 @@ return [
         Command\Api\DisableKeyCommand::class => [ApiKeyService::class],
         Command\Api\ListKeysCommand::class => [ApiKeyService::class],
 
-        Command\Tag\ListTagsCommand::class => [\Shlinkio\Shlink\Core\Tag\TagService::class],
-        Command\Tag\CreateTagCommand::class => [\Shlinkio\Shlink\Core\Tag\TagService::class],
-        Command\Tag\RenameTagCommand::class => [\Shlinkio\Shlink\Core\Tag\TagService::class],
-        Command\Tag\DeleteTagsCommand::class => [\Shlinkio\Shlink\Core\Tag\TagService::class],
+        Command\Tag\ListTagsCommand::class => [TagService::class],
+        Command\Tag\CreateTagCommand::class => [TagService::class],
+        Command\Tag\RenameTagCommand::class => [TagService::class],
+        Command\Tag\DeleteTagsCommand::class => [TagService::class],
 
         Command\Db\CreateDatabaseCommand::class => [
             LockFactory::class,
diff --git a/module/CLI/src/Command/Tag/DeleteTagsCommand.php b/module/CLI/src/Command/Tag/DeleteTagsCommand.php
index f50f835a..2b3eae14 100644
--- a/module/CLI/src/Command/Tag/DeleteTagsCommand.php
+++ b/module/CLI/src/Command/Tag/DeleteTagsCommand.php
@@ -16,9 +16,9 @@ class DeleteTagsCommand extends Command
 {
     public const NAME = 'tag:delete';
 
-    private \Shlinkio\Shlink\Core\Tag\TagServiceInterface $tagService;
+    private TagServiceInterface $tagService;
 
-    public function __construct(\Shlinkio\Shlink\Core\Tag\TagServiceInterface $tagService)
+    public function __construct(TagServiceInterface $tagService)
     {
         parent::__construct();
         $this->tagService = $tagService;
diff --git a/module/CLI/src/Command/Tag/RenameTagCommand.php b/module/CLI/src/Command/Tag/RenameTagCommand.php
index 2a4a1245..fe42a832 100644
--- a/module/CLI/src/Command/Tag/RenameTagCommand.php
+++ b/module/CLI/src/Command/Tag/RenameTagCommand.php
@@ -20,7 +20,7 @@ class RenameTagCommand extends Command
 
     private TagServiceInterface $tagService;
 
-    public function __construct(\Shlinkio\Shlink\Core\Tag\TagServiceInterface $tagService)
+    public function __construct(TagServiceInterface $tagService)
     {
         parent::__construct();
         $this->tagService = $tagService;
diff --git a/module/CLI/test/Command/Tag/DeleteTagsCommandTest.php b/module/CLI/test/Command/Tag/DeleteTagsCommandTest.php
index 1ec75c8f..27a95de8 100644
--- a/module/CLI/test/Command/Tag/DeleteTagsCommandTest.php
+++ b/module/CLI/test/Command/Tag/DeleteTagsCommandTest.php
@@ -18,7 +18,7 @@ class DeleteTagsCommandTest extends TestCase
 
     public function setUp(): void
     {
-        $this->tagService = $this->prophesize(\Shlinkio\Shlink\Core\Tag\TagServiceInterface::class);
+        $this->tagService = $this->prophesize(TagServiceInterface::class);
 
         $command = new DeleteTagsCommand($this->tagService->reveal());
         $app = new Application();
diff --git a/module/CLI/test/Command/Tag/ListTagsCommandTest.php b/module/CLI/test/Command/Tag/ListTagsCommandTest.php
index b3914916..4318e906 100644
--- a/module/CLI/test/Command/Tag/ListTagsCommandTest.php
+++ b/module/CLI/test/Command/Tag/ListTagsCommandTest.php
@@ -19,7 +19,7 @@ class ListTagsCommandTest extends TestCase
 
     public function setUp(): void
     {
-        $this->tagService = $this->prophesize(\Shlinkio\Shlink\Core\Tag\TagServiceInterface::class);
+        $this->tagService = $this->prophesize(TagServiceInterface::class);
 
         $command = new ListTagsCommand($this->tagService->reveal());
         $app = new Application();
diff --git a/module/Core/src/Repository/TagRepository.php b/module/Core/src/Repository/TagRepository.php
index 6f4cbf8c..25c05596 100644
--- a/module/Core/src/Repository/TagRepository.php
+++ b/module/Core/src/Repository/TagRepository.php
@@ -7,6 +7,7 @@ namespace Shlinkio\Shlink\Core\Repository;
 use Doctrine\ORM\EntityRepository;
 use Shlinkio\Shlink\Core\Entity\Tag;
 use Shlinkio\Shlink\Core\Tag\Model\TagInfo;
+
 use function Functional\map;
 
 class TagRepository extends EntityRepository implements TagRepositoryInterface
diff --git a/module/Rest/config/dependencies.config.php b/module/Rest/config/dependencies.config.php
index c7623ff7..a10fd254 100644
--- a/module/Rest/config/dependencies.config.php
+++ b/module/Rest/config/dependencies.config.php
@@ -10,6 +10,7 @@ use Mezzio\Router\Middleware\ImplicitOptionsMiddleware;
 use Shlinkio\Shlink\Common\Mercure\LcobucciJwtProvider;
 use Shlinkio\Shlink\Core\Options\AppOptions;
 use Shlinkio\Shlink\Core\Service;
+use Shlinkio\Shlink\Core\Tag\TagService;
 use Shlinkio\Shlink\Core\Visit;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 
@@ -65,10 +66,10 @@ return [
         Action\Visit\GlobalVisitsAction::class => [Visit\VisitsStatsHelper::class],
         Action\ShortUrl\ListShortUrlsAction::class => [Service\ShortUrlService::class, 'config.url_shortener.domain'],
         Action\ShortUrl\EditShortUrlTagsAction::class => [Service\ShortUrlService::class],
-        Action\Tag\ListTagsAction::class => [\Shlinkio\Shlink\Core\Tag\TagService::class],
-        Action\Tag\DeleteTagsAction::class => [\Shlinkio\Shlink\Core\Tag\TagService::class],
-        Action\Tag\CreateTagsAction::class => [\Shlinkio\Shlink\Core\Tag\TagService::class],
-        Action\Tag\UpdateTagAction::class => [\Shlinkio\Shlink\Core\Tag\TagService::class],
+        Action\Tag\ListTagsAction::class => [TagService::class],
+        Action\Tag\DeleteTagsAction::class => [TagService::class],
+        Action\Tag\CreateTagsAction::class => [TagService::class],
+        Action\Tag\UpdateTagAction::class => [TagService::class],
 
         Middleware\ShortUrl\DropDefaultDomainFromRequestMiddleware::class => ['config.url_shortener.domain.hostname'],
         Middleware\ShortUrl\DefaultShortCodesLengthMiddleware::class => [
diff --git a/module/Rest/src/Action/Tag/DeleteTagsAction.php b/module/Rest/src/Action/Tag/DeleteTagsAction.php
index 62d13a16..f38c443a 100644
--- a/module/Rest/src/Action/Tag/DeleteTagsAction.php
+++ b/module/Rest/src/Action/Tag/DeleteTagsAction.php
@@ -17,7 +17,7 @@ class DeleteTagsAction extends AbstractRestAction
 
     private TagServiceInterface $tagService;
 
-    public function __construct(\Shlinkio\Shlink\Core\Tag\TagServiceInterface $tagService)
+    public function __construct(TagServiceInterface $tagService)
     {
         $this->tagService = $tagService;
     }
diff --git a/module/Rest/src/Action/Tag/UpdateTagAction.php b/module/Rest/src/Action/Tag/UpdateTagAction.php
index 34924f78..fbf93f50 100644
--- a/module/Rest/src/Action/Tag/UpdateTagAction.php
+++ b/module/Rest/src/Action/Tag/UpdateTagAction.php
@@ -16,7 +16,7 @@ class UpdateTagAction extends AbstractRestAction
     protected const ROUTE_PATH = '/tags';
     protected const ROUTE_ALLOWED_METHODS = [self::METHOD_PUT];
 
-    private \Shlinkio\Shlink\Core\Tag\TagServiceInterface $tagService;
+    private TagServiceInterface $tagService;
 
     public function __construct(TagServiceInterface $tagService)
     {
diff --git a/module/Rest/test/Action/Tag/ListTagsActionTest.php b/module/Rest/test/Action/Tag/ListTagsActionTest.php
index daacb657..813d62f4 100644
--- a/module/Rest/test/Action/Tag/ListTagsActionTest.php
+++ b/module/Rest/test/Action/Tag/ListTagsActionTest.php
@@ -20,7 +20,7 @@ class ListTagsActionTest extends TestCase
 
     public function setUp(): void
     {
-        $this->tagService = $this->prophesize(\Shlinkio\Shlink\Core\Tag\TagServiceInterface::class);
+        $this->tagService = $this->prophesize(TagServiceInterface::class);
         $this->action = new ListTagsAction($this->tagService->reveal());
     }
 
diff --git a/module/Rest/test/Action/Tag/UpdateTagActionTest.php b/module/Rest/test/Action/Tag/UpdateTagActionTest.php
index 7d865642..11b2c1c4 100644
--- a/module/Rest/test/Action/Tag/UpdateTagActionTest.php
+++ b/module/Rest/test/Action/Tag/UpdateTagActionTest.php
@@ -19,7 +19,7 @@ class UpdateTagActionTest extends TestCase
 
     public function setUp(): void
     {
-        $this->tagService = $this->prophesize(\Shlinkio\Shlink\Core\Tag\TagServiceInterface::class);
+        $this->tagService = $this->prophesize(TagServiceInterface::class);
         $this->action = new UpdateTagAction($this->tagService->reveal());
     }