diff --git a/module/Rest/config/auth.config.php b/module/Rest/config/auth.config.php
index b43c333f..c60cc358 100644
--- a/module/Rest/config/auth.config.php
+++ b/module/Rest/config/auth.config.php
@@ -8,7 +8,7 @@ return [
     'auth' => [
         'routes_whitelist' => [
             Action\AuthenticateAction::class,
-            Action\ShortCode\SingleStepCreateShortCodeAction::class,
+            Action\ShortUrl\SingleStepCreateShortUrlAction::class,
         ],
     ],
 
diff --git a/module/Rest/config/dependencies.config.php b/module/Rest/config/dependencies.config.php
index ae500a22..8b8a4f02 100644
--- a/module/Rest/config/dependencies.config.php
+++ b/module/Rest/config/dependencies.config.php
@@ -20,14 +20,14 @@ return [
             ApiKeyService::class => ConfigAbstractFactory::class,
 
             Action\AuthenticateAction::class => ConfigAbstractFactory::class,
-            Action\ShortCode\CreateShortCodeAction::class => ConfigAbstractFactory::class,
-            Action\ShortCode\SingleStepCreateShortCodeAction::class => ConfigAbstractFactory::class,
-            Action\ShortCode\EditShortCodeAction::class => ConfigAbstractFactory::class,
-            Action\ShortCode\DeleteShortCodeAction::class => ConfigAbstractFactory::class,
-            Action\ShortCode\ResolveUrlAction::class => ConfigAbstractFactory::class,
+            Action\ShortUrl\CreateShortUrlAction::class => ConfigAbstractFactory::class,
+            Action\ShortUrl\SingleStepCreateShortUrlAction::class => ConfigAbstractFactory::class,
+            Action\ShortUrl\EditShortUrlAction::class => ConfigAbstractFactory::class,
+            Action\ShortUrl\DeleteShortUrlAction::class => ConfigAbstractFactory::class,
+            Action\ShortUrl\ResolveShortUrlAction::class => ConfigAbstractFactory::class,
             Action\Visit\GetVisitsAction::class => ConfigAbstractFactory::class,
-            Action\ShortCode\ListShortCodesAction::class => ConfigAbstractFactory::class,
-            Action\ShortCode\EditShortCodeTagsAction::class => ConfigAbstractFactory::class,
+            Action\ShortUrl\ListShortUrlsAction::class => ConfigAbstractFactory::class,
+            Action\ShortUrl\EditShortUrlTagsAction::class => ConfigAbstractFactory::class,
             Action\Tag\ListTagsAction::class => ConfigAbstractFactory::class,
             Action\Tag\DeleteTagsAction::class => ConfigAbstractFactory::class,
             Action\Tag\CreateTagsAction::class => ConfigAbstractFactory::class,
@@ -46,38 +46,38 @@ return [
         ApiKeyService::class => ['em'],
 
         Action\AuthenticateAction::class => [ApiKeyService::class, JWTService::class, 'translator', 'Logger_Shlink'],
-        Action\ShortCode\CreateShortCodeAction::class => [
+        Action\ShortUrl\CreateShortUrlAction::class => [
             Service\UrlShortener::class,
             'translator',
             'config.url_shortener.domain',
             'Logger_Shlink',
         ],
-        Action\ShortCode\SingleStepCreateShortCodeAction::class => [
+        Action\ShortUrl\SingleStepCreateShortUrlAction::class => [
             Service\UrlShortener::class,
             'translator',
             ApiKeyService::class,
             'config.url_shortener.domain',
             'Logger_Shlink',
         ],
-        Action\ShortCode\EditShortCodeAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink'],
-        Action\ShortCode\DeleteShortCodeAction::class => [
+        Action\ShortUrl\EditShortUrlAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink'],
+        Action\ShortUrl\DeleteShortUrlAction::class => [
             Service\ShortUrl\DeleteShortUrlService::class,
             'translator',
             'Logger_Shlink',
         ],
-        Action\ShortCode\ResolveUrlAction::class => [
+        Action\ShortUrl\ResolveShortUrlAction::class => [
             Service\UrlShortener::class,
             'translator',
             'config.url_shortener.domain',
         ],
         Action\Visit\GetVisitsAction::class => [Service\VisitsTracker::class, 'translator', 'Logger_Shlink'],
-        Action\ShortCode\ListShortCodesAction::class => [
+        Action\ShortUrl\ListShortUrlsAction::class => [
             Service\ShortUrlService::class,
             'translator',
             'config.url_shortener.domain',
             'Logger_Shlink',
         ],
-        Action\ShortCode\EditShortCodeTagsAction::class => [
+        Action\ShortUrl\EditShortUrlTagsAction::class => [
             Service\ShortUrlService::class,
             'translator',
             'Logger_Shlink',
diff --git a/module/Rest/config/routes.config.php b/module/Rest/config/routes.config.php
index 7058ad59..b1ab3d78 100644
--- a/module/Rest/config/routes.config.php
+++ b/module/Rest/config/routes.config.php
@@ -11,17 +11,17 @@ return [
         Action\AuthenticateAction::getRouteDef(),
 
         // Short codes
-        Action\ShortCode\CreateShortCodeAction::getRouteDef([
+        Action\ShortUrl\CreateShortUrlAction::getRouteDef([
             Middleware\ShortCode\CreateShortCodeContentNegotiationMiddleware::class,
         ]),
-        Action\ShortCode\SingleStepCreateShortCodeAction::getRouteDef([
+        Action\ShortUrl\SingleStepCreateShortUrlAction::getRouteDef([
             Middleware\ShortCode\CreateShortCodeContentNegotiationMiddleware::class,
         ]),
-        Action\ShortCode\EditShortCodeAction::getRouteDef(),
-        Action\ShortCode\DeleteShortCodeAction::getRouteDef(),
-        Action\ShortCode\ResolveUrlAction::getRouteDef(),
-        Action\ShortCode\ListShortCodesAction::getRouteDef(),
-        Action\ShortCode\EditShortCodeTagsAction::getRouteDef(),
+        Action\ShortUrl\EditShortUrlAction::getRouteDef(),
+        Action\ShortUrl\DeleteShortUrlAction::getRouteDef(),
+        Action\ShortUrl\ResolveShortUrlAction::getRouteDef(),
+        Action\ShortUrl\ListShortUrlsAction::getRouteDef(),
+        Action\ShortUrl\EditShortUrlTagsAction::getRouteDef(),
 
         // Visits
         Action\Visit\GetVisitsAction::getRouteDef(),
diff --git a/module/Rest/src/Action/ShortCode/AbstractCreateShortCodeAction.php b/module/Rest/src/Action/ShortUrl/AbstractCreateShortUrlAction.php
similarity index 97%
rename from module/Rest/src/Action/ShortCode/AbstractCreateShortCodeAction.php
rename to module/Rest/src/Action/ShortUrl/AbstractCreateShortUrlAction.php
index 833f49c6..fbf1817a 100644
--- a/module/Rest/src/Action/ShortCode/AbstractCreateShortCodeAction.php
+++ b/module/Rest/src/Action/ShortUrl/AbstractCreateShortUrlAction.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action\ShortCode;
+namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -17,7 +17,7 @@ use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\I18n\Translator\TranslatorInterface;
 
-abstract class AbstractCreateShortCodeAction extends AbstractRestAction
+abstract class AbstractCreateShortUrlAction extends AbstractRestAction
 {
     /**
      * @var UrlShortenerInterface
diff --git a/module/Rest/src/Action/ShortCode/CreateShortCodeAction.php b/module/Rest/src/Action/ShortUrl/CreateShortUrlAction.php
similarity index 89%
rename from module/Rest/src/Action/ShortCode/CreateShortCodeAction.php
rename to module/Rest/src/Action/ShortUrl/CreateShortUrlAction.php
index da556420..925da8d0 100644
--- a/module/Rest/src/Action/ShortCode/CreateShortCodeAction.php
+++ b/module/Rest/src/Action/ShortUrl/CreateShortUrlAction.php
@@ -1,15 +1,16 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action\ShortCode;
+namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
 
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Shlinkio\Shlink\Core\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Core\Model\CreateShortCodeData;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
+use Shlinkio\Shlink\Rest\Action\ShortUrl\AbstractCreateShortUrlAction;
 use Zend\Diactoros\Uri;
 
-class CreateShortCodeAction extends AbstractCreateShortCodeAction
+class CreateShortUrlAction extends AbstractCreateShortUrlAction
 {
     protected const ROUTE_PATH = '/short-codes';
     protected const ROUTE_ALLOWED_METHODS = [self::METHOD_POST];
diff --git a/module/Rest/src/Action/ShortCode/DeleteShortCodeAction.php b/module/Rest/src/Action/ShortUrl/DeleteShortUrlAction.php
similarity index 96%
rename from module/Rest/src/Action/ShortCode/DeleteShortCodeAction.php
rename to module/Rest/src/Action/ShortUrl/DeleteShortUrlAction.php
index 8fa9ca5b..aea480cb 100644
--- a/module/Rest/src/Action/ShortCode/DeleteShortCodeAction.php
+++ b/module/Rest/src/Action/ShortUrl/DeleteShortUrlAction.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action\ShortCode;
+namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -14,7 +14,7 @@ use Zend\Diactoros\Response\EmptyResponse;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\I18n\Translator\TranslatorInterface;
 
-class DeleteShortCodeAction extends AbstractRestAction
+class DeleteShortUrlAction extends AbstractRestAction
 {
     protected const ROUTE_PATH = '/short-codes/{shortCode}';
     protected const ROUTE_ALLOWED_METHODS = [self::METHOD_DELETE];
diff --git a/module/Rest/src/Action/ShortCode/EditShortCodeAction.php b/module/Rest/src/Action/ShortUrl/EditShortUrlAction.php
similarity index 96%
rename from module/Rest/src/Action/ShortCode/EditShortCodeAction.php
rename to module/Rest/src/Action/ShortUrl/EditShortUrlAction.php
index 6a750a62..523edc3d 100644
--- a/module/Rest/src/Action/ShortCode/EditShortCodeAction.php
+++ b/module/Rest/src/Action/ShortUrl/EditShortUrlAction.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action\ShortCode;
+namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -15,7 +15,7 @@ use Zend\Diactoros\Response\EmptyResponse;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\I18n\Translator\TranslatorInterface;
 
-class EditShortCodeAction extends AbstractRestAction
+class EditShortUrlAction extends AbstractRestAction
 {
     protected const ROUTE_PATH = '/short-codes/{shortCode}';
     protected const ROUTE_ALLOWED_METHODS = [self::METHOD_PUT];
diff --git a/module/Rest/src/Action/ShortCode/EditShortCodeTagsAction.php b/module/Rest/src/Action/ShortUrl/EditShortUrlTagsAction.php
similarity index 95%
rename from module/Rest/src/Action/ShortCode/EditShortCodeTagsAction.php
rename to module/Rest/src/Action/ShortUrl/EditShortUrlTagsAction.php
index b863720b..3db0d900 100644
--- a/module/Rest/src/Action/ShortCode/EditShortCodeTagsAction.php
+++ b/module/Rest/src/Action/ShortUrl/EditShortUrlTagsAction.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action\ShortCode;
+namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -13,7 +13,7 @@ use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\I18n\Translator\TranslatorInterface;
 
-class EditShortCodeTagsAction extends AbstractRestAction
+class EditShortUrlTagsAction extends AbstractRestAction
 {
     protected const ROUTE_PATH = '/short-codes/{shortCode}/tags';
     protected const ROUTE_ALLOWED_METHODS = [self::METHOD_PUT];
diff --git a/module/Rest/src/Action/ShortCode/ListShortCodesAction.php b/module/Rest/src/Action/ShortUrl/ListShortUrlsAction.php
similarity index 96%
rename from module/Rest/src/Action/ShortCode/ListShortCodesAction.php
rename to module/Rest/src/Action/ShortUrl/ListShortUrlsAction.php
index f95be789..c58dcba0 100644
--- a/module/Rest/src/Action/ShortCode/ListShortCodesAction.php
+++ b/module/Rest/src/Action/ShortUrl/ListShortUrlsAction.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action\ShortCode;
+namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -14,7 +14,7 @@ use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\I18n\Translator\TranslatorInterface;
 
-class ListShortCodesAction extends AbstractRestAction
+class ListShortUrlsAction extends AbstractRestAction
 {
     use PaginatorUtilsTrait;
 
diff --git a/module/Rest/src/Action/ShortCode/ResolveUrlAction.php b/module/Rest/src/Action/ShortUrl/ResolveShortUrlAction.php
similarity index 96%
rename from module/Rest/src/Action/ShortCode/ResolveUrlAction.php
rename to module/Rest/src/Action/ShortUrl/ResolveShortUrlAction.php
index d847c4d9..e1ab9639 100644
--- a/module/Rest/src/Action/ShortCode/ResolveUrlAction.php
+++ b/module/Rest/src/Action/ShortUrl/ResolveShortUrlAction.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action\ShortCode;
+namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -15,7 +15,7 @@ use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\I18n\Translator\TranslatorInterface;
 
-class ResolveUrlAction extends AbstractRestAction
+class ResolveShortUrlAction extends AbstractRestAction
 {
     protected const ROUTE_PATH = '/short-codes/{shortCode}';
     protected const ROUTE_ALLOWED_METHODS = [self::METHOD_GET];
diff --git a/module/Rest/src/Action/ShortCode/SingleStepCreateShortCodeAction.php b/module/Rest/src/Action/ShortUrl/SingleStepCreateShortUrlAction.php
similarity index 90%
rename from module/Rest/src/Action/ShortCode/SingleStepCreateShortCodeAction.php
rename to module/Rest/src/Action/ShortUrl/SingleStepCreateShortUrlAction.php
index 99c8af17..1003ebfd 100644
--- a/module/Rest/src/Action/ShortCode/SingleStepCreateShortCodeAction.php
+++ b/module/Rest/src/Action/ShortUrl/SingleStepCreateShortUrlAction.php
@@ -1,18 +1,19 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action\ShortCode;
+namespace Shlinkio\Shlink\Rest\Action\ShortUrl;
 
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Core\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Core\Model\CreateShortCodeData;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
+use Shlinkio\Shlink\Rest\Action\ShortUrl\AbstractCreateShortUrlAction;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Zend\Diactoros\Uri;
 use Zend\I18n\Translator\TranslatorInterface;
 
-class SingleStepCreateShortCodeAction extends AbstractCreateShortCodeAction
+class SingleStepCreateShortUrlAction extends AbstractCreateShortUrlAction
 {
     protected const ROUTE_PATH = '/short-codes/shorten';
     protected const ROUTE_ALLOWED_METHODS = [self::METHOD_GET];
diff --git a/module/Rest/test/Action/ShortCode/CreateShortCodeActionTest.php b/module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php
similarity index 92%
rename from module/Rest/test/Action/ShortCode/CreateShortCodeActionTest.php
rename to module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php
index 8b7afe7c..d4d4e63c 100644
--- a/module/Rest/test/Action/ShortCode/CreateShortCodeActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/CreateShortUrlActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -10,16 +10,16 @@ use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
-use Shlinkio\Shlink\Rest\Action\ShortCode\CreateShortCodeAction;
+use Shlinkio\Shlink\Rest\Action\ShortUrl\CreateShortUrlAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Uri;
 use Zend\I18n\Translator\Translator;
 
-class CreateShortCodeActionTest extends TestCase
+class CreateShortUrlActionTest extends TestCase
 {
     /**
-     * @var CreateShortCodeAction
+     * @var CreateShortUrlAction
      */
     protected $action;
     /**
@@ -30,7 +30,7 @@ class CreateShortCodeActionTest extends TestCase
     public function setUp()
     {
         $this->urlShortener = $this->prophesize(UrlShortener::class);
-        $this->action = new CreateShortCodeAction($this->urlShortener->reveal(), Translator::factory([]), [
+        $this->action = new CreateShortUrlAction($this->urlShortener->reveal(), Translator::factory([]), [
             'schema' => 'http',
             'hostname' => 'foo.com',
         ]);
diff --git a/module/Rest/test/Action/ShortCode/DeleteShortCodeActionTest.php b/module/Rest/test/Action/ShortUrl/DeleteShortUrlActionTest.php
similarity index 86%
rename from module/Rest/test/Action/ShortCode/DeleteShortCodeActionTest.php
rename to module/Rest/test/Action/ShortUrl/DeleteShortUrlActionTest.php
index 3c5a5c87..abcd61cf 100644
--- a/module/Rest/test/Action/ShortCode/DeleteShortCodeActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/DeleteShortUrlActionTest.php
@@ -1,23 +1,23 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Exception;
 use Shlinkio\Shlink\Core\Service\ShortUrl\DeleteShortUrlServiceInterface;
-use Shlinkio\Shlink\Rest\Action\ShortCode\DeleteShortCodeAction;
+use Shlinkio\Shlink\Rest\Action\ShortUrl\DeleteShortUrlAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;
 
-class DeleteShortCodeActionTest extends TestCase
+class DeleteShortUrlActionTest extends TestCase
 {
     /**
-     * @var DeleteShortCodeAction
+     * @var DeleteShortUrlAction
      */
     private $action;
     /**
@@ -28,7 +28,7 @@ class DeleteShortCodeActionTest extends TestCase
     public function setUp()
     {
         $this->service = $this->prophesize(DeleteShortUrlServiceInterface::class);
-        $this->action = new DeleteShortCodeAction($this->service->reveal(), Translator::factory([]));
+        $this->action = new DeleteShortUrlAction($this->service->reveal(), Translator::factory([]));
     }
 
     /**
diff --git a/module/Rest/test/Action/ShortCode/EditShortCodeActionTest.php b/module/Rest/test/Action/ShortUrl/EditShortUrlActionTest.php
similarity index 90%
rename from module/Rest/test/Action/ShortCode/EditShortCodeActionTest.php
rename to module/Rest/test/Action/ShortUrl/EditShortUrlActionTest.php
index e96ccdf8..e0cfb13e 100644
--- a/module/Rest/test/Action/ShortCode/EditShortCodeActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/EditShortUrlActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -9,16 +9,16 @@ use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
-use Shlinkio\Shlink\Rest\Action\ShortCode\EditShortCodeAction;
+use Shlinkio\Shlink\Rest\Action\ShortUrl\EditShortUrlAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;
 
-class EditShortCodeActionTest extends TestCase
+class EditShortUrlActionTest extends TestCase
 {
     /**
-     * @var EditShortCodeAction
+     * @var EditShortUrlAction
      */
     private $action;
     /**
@@ -29,7 +29,7 @@ class EditShortCodeActionTest extends TestCase
     public function setUp()
     {
         $this->shortUrlService = $this->prophesize(ShortUrlServiceInterface::class);
-        $this->action = new EditShortCodeAction($this->shortUrlService->reveal(), Translator::factory([]));
+        $this->action = new EditShortUrlAction($this->shortUrlService->reveal(), Translator::factory([]));
     }
 
     /**
diff --git a/module/Rest/test/Action/ShortCode/EditShortCodeTagsActionTest.php b/module/Rest/test/Action/ShortUrl/EditShortUrlTagsActionTest.php
similarity index 86%
rename from module/Rest/test/Action/ShortCode/EditShortCodeTagsActionTest.php
rename to module/Rest/test/Action/ShortUrl/EditShortUrlTagsActionTest.php
index d7eab463..dc4b4a5c 100644
--- a/module/Rest/test/Action/ShortCode/EditShortCodeTagsActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/EditShortUrlTagsActionTest.php
@@ -1,21 +1,21 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\ShortUrlService;
-use Shlinkio\Shlink\Rest\Action\ShortCode\EditShortCodeTagsAction;
+use Shlinkio\Shlink\Rest\Action\ShortUrl\EditShortUrlTagsAction;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;
 
-class EditShortCodeTagsActionTest extends TestCase
+class EditShortUrlTagsActionTest extends TestCase
 {
     /**
-     * @var EditShortCodeTagsAction
+     * @var EditShortUrlTagsAction
      */
     protected $action;
     /**
@@ -26,7 +26,7 @@ class EditShortCodeTagsActionTest extends TestCase
     public function setUp()
     {
         $this->shortUrlService = $this->prophesize(ShortUrlService::class);
-        $this->action = new EditShortCodeTagsAction($this->shortUrlService->reveal(), Translator::factory([]));
+        $this->action = new EditShortUrlTagsAction($this->shortUrlService->reveal(), Translator::factory([]));
     }
 
     /**
diff --git a/module/Rest/test/Action/ShortCode/ListShortCodesActionTest.php b/module/Rest/test/Action/ShortUrl/ListShortUrlsActionTest.php
similarity index 84%
rename from module/Rest/test/Action/ShortCode/ListShortCodesActionTest.php
rename to module/Rest/test/Action/ShortUrl/ListShortUrlsActionTest.php
index 7c414e44..eecbb8d8 100644
--- a/module/Rest/test/Action/ShortCode/ListShortCodesActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/ListShortUrlsActionTest.php
@@ -1,21 +1,21 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Service\ShortUrlService;
-use Shlinkio\Shlink\Rest\Action\ShortCode\ListShortCodesAction;
+use Shlinkio\Shlink\Rest\Action\ShortUrl\ListShortUrlsAction;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;
 use Zend\Paginator\Adapter\ArrayAdapter;
 use Zend\Paginator\Paginator;
 
-class ListShortCodesActionTest extends TestCase
+class ListShortUrlsActionTest extends TestCase
 {
     /**
-     * @var ListShortCodesAction
+     * @var ListShortUrlsAction
      */
     protected $action;
     /**
@@ -26,7 +26,7 @@ class ListShortCodesActionTest extends TestCase
     public function setUp()
     {
         $this->service = $this->prophesize(ShortUrlService::class);
-        $this->action = new ListShortCodesAction($this->service->reveal(), Translator::factory([]), [
+        $this->action = new ListShortUrlsAction($this->service->reveal(), Translator::factory([]), [
             'hostname' => 'doma.in',
             'schema' => 'https',
         ]);
diff --git a/module/Rest/test/Action/ShortCode/ResolveUrlActionTest.php b/module/Rest/test/Action/ShortUrl/ResolveShortUrlActionTest.php
similarity index 91%
rename from module/Rest/test/Action/ShortCode/ResolveUrlActionTest.php
rename to module/Rest/test/Action/ShortUrl/ResolveShortUrlActionTest.php
index bde3e89a..a6159ec1 100644
--- a/module/Rest/test/Action/ShortCode/ResolveUrlActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/ResolveShortUrlActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -9,15 +9,15 @@ use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
-use Shlinkio\Shlink\Rest\Action\ShortCode\ResolveUrlAction;
+use Shlinkio\Shlink\Rest\Action\ShortUrl\ResolveShortUrlAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;
 
-class ResolveUrlActionTest extends TestCase
+class ResolveShortUrlActionTest extends TestCase
 {
     /**
-     * @var ResolveUrlAction
+     * @var ResolveShortUrlAction
      */
     protected $action;
     /**
@@ -28,7 +28,7 @@ class ResolveUrlActionTest extends TestCase
     public function setUp()
     {
         $this->urlShortener = $this->prophesize(UrlShortener::class);
-        $this->action = new ResolveUrlAction($this->urlShortener->reveal(), Translator::factory([]), []);
+        $this->action = new ResolveShortUrlAction($this->urlShortener->reveal(), Translator::factory([]), []);
     }
 
     /**
diff --git a/module/Rest/test/Action/ShortCode/SingleStepCreateShortCodeActionTest.php b/module/Rest/test/Action/ShortUrl/SingleStepCreateShortUrlActionTest.php
similarity index 92%
rename from module/Rest/test/Action/ShortCode/SingleStepCreateShortCodeActionTest.php
rename to module/Rest/test/Action/ShortUrl/SingleStepCreateShortUrlActionTest.php
index 0a7d6981..438132cb 100644
--- a/module/Rest/test/Action/ShortCode/SingleStepCreateShortCodeActionTest.php
+++ b/module/Rest/test/Action/ShortUrl/SingleStepCreateShortUrlActionTest.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Action\ShortCode;
+namespace ShlinkioTest\Shlink\Rest\Action\ShortUrl;
 
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
@@ -10,17 +10,17 @@ use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\UriInterface;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
-use Shlinkio\Shlink\Rest\Action\ShortCode\SingleStepCreateShortCodeAction;
+use Shlinkio\Shlink\Rest\Action\ShortUrl\SingleStepCreateShortUrlAction;
 use Shlinkio\Shlink\Rest\Entity\ApiKey;
 use Shlinkio\Shlink\Rest\Service\ApiKeyServiceInterface;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;
 
-class SingleStepCreateShortCodeActionTest extends TestCase
+class SingleStepCreateShortUrlActionTest extends TestCase
 {
     /**
-     * @var SingleStepCreateShortCodeAction
+     * @var SingleStepCreateShortUrlAction
      */
     private $action;
     /**
@@ -37,7 +37,7 @@ class SingleStepCreateShortCodeActionTest extends TestCase
         $this->urlShortener = $this->prophesize(UrlShortenerInterface::class);
         $this->apiKeyService = $this->prophesize(ApiKeyServiceInterface::class);
 
-        $this->action = new SingleStepCreateShortCodeAction(
+        $this->action = new SingleStepCreateShortUrlAction(
             $this->urlShortener->reveal(),
             Translator::factory([]),
             $this->apiKeyService->reveal(),