diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json
index b60ab79c..c7df5490 100644
--- a/docs/swagger/swagger.json
+++ b/docs/swagger/swagger.json
@@ -37,7 +37,6 @@
             "$ref": "paths/v1_tags.json"
         },
 
-
         "/v1/short-codes/{shortCode}/visits": {
             "$ref": "paths/v1_short-codes_{shortCode}_visits.json"
         }
diff --git a/module/Core/src/Util/TagManagerTrait.php b/module/Core/src/Util/TagManagerTrait.php
index 9ca02b92..e20e1919 100644
--- a/module/Core/src/Util/TagManagerTrait.php
+++ b/module/Core/src/Util/TagManagerTrait.php
@@ -26,7 +26,7 @@ trait TagManagerTrait
     }
 
     /**
-     * Tag names are trimmed, lowercased and spaces are replaced by dashes
+     * Tag names are trimmed, lower cased and spaces are replaced by dashes
      *
      * @param string $tagName
      * @return string
diff --git a/module/Rest/config/dependencies.config.php b/module/Rest/config/dependencies.config.php
index d48d319b..9428075e 100644
--- a/module/Rest/config/dependencies.config.php
+++ b/module/Rest/config/dependencies.config.php
@@ -19,7 +19,7 @@ return [
             Action\GetVisitsAction::class => AnnotatedFactory::class,
             Action\ListShortcodesAction::class => AnnotatedFactory::class,
             Action\EditShortcodeTagsAction::class => AnnotatedFactory::class,
-            Action\ListTagsAction::class => AnnotatedFactory::class,
+            Action\Tag\ListTagsAction::class => AnnotatedFactory::class,
 
             Middleware\BodyParserMiddleware::class => AnnotatedFactory::class,
             Middleware\CrossDomainMiddleware::class => InvokableFactory::class,
diff --git a/module/Rest/src/Action/ListTagsAction.php b/module/Rest/src/Action/Tag/ListTagsAction.php
similarity index 93%
rename from module/Rest/src/Action/ListTagsAction.php
rename to module/Rest/src/Action/Tag/ListTagsAction.php
index afee7df5..acfa0846 100644
--- a/module/Rest/src/Action/ListTagsAction.php
+++ b/module/Rest/src/Action/Tag/ListTagsAction.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\Rest\Action;
+namespace Shlinkio\Shlink\Rest\Action\Tag;
 
 use Acelaya\ZsmAnnotatedServices\Annotation as DI;
 use Interop\Http\ServerMiddleware\DelegateInterface;
@@ -8,6 +8,7 @@ use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Core\Service\Tag\TagService;
 use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
+use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Zend\Diactoros\Response\JsonResponse;
 
 class ListTagsAction extends AbstractRestAction
diff --git a/module/Rest/test/Action/ListTagsActionTest.php b/module/Rest/test/Action/Tag/ListTagsActionTest.php
similarity index 92%
rename from module/Rest/test/Action/ListTagsActionTest.php
rename to module/Rest/test/Action/Tag/ListTagsActionTest.php
index cf768843..d03791c3 100644
--- a/module/Rest/test/Action/ListTagsActionTest.php
+++ b/module/Rest/test/Action/Tag/ListTagsActionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace ShlinkioTest\Shlink\Rest\Action;
+namespace ShlinkioTest\Shlink\Rest\Action\Tag;
 
 use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
@@ -7,7 +7,7 @@ use Prophecy\Prophecy\MethodProphecy;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\Tag;
 use Shlinkio\Shlink\Core\Service\Tag\TagServiceInterface;
-use Shlinkio\Shlink\Rest\Action\ListTagsAction;
+use Shlinkio\Shlink\Rest\Action\Tag\ListTagsAction;
 use Zend\Diactoros\ServerRequestFactory;
 
 class ListTagsActionTest extends TestCase