diff --git a/module/Rest/config/dependencies.config.php b/module/Rest/config/dependencies.config.php
index d5de2114..7b55290c 100644
--- a/module/Rest/config/dependencies.config.php
+++ b/module/Rest/config/dependencies.config.php
@@ -22,7 +22,7 @@ return [
             Action\AuthenticateAction::class => ConfigAbstractFactory::class,
             Action\ShortCode\CreateShortCodeAction::class => ConfigAbstractFactory::class,
             Action\ShortCode\SingleStepCreateShortCodeAction::class => ConfigAbstractFactory::class,
-            Action\EditShortCodeAction::class => ConfigAbstractFactory::class,
+            Action\ShortCode\EditShortCodeAction::class => ConfigAbstractFactory::class,
             Action\ResolveUrlAction::class => ConfigAbstractFactory::class,
             Action\GetVisitsAction::class => ConfigAbstractFactory::class,
             Action\ListShortCodesAction::class => ConfigAbstractFactory::class,
@@ -57,7 +57,7 @@ return [
             'config.url_shortener.domain',
             'Logger_Shlink',
         ],
-        Action\EditShortCodeAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink',],
+        Action\ShortCode\EditShortCodeAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink',],
         Action\ResolveUrlAction::class => [Service\UrlShortener::class, 'translator'],
         Action\GetVisitsAction::class => [Service\VisitsTracker::class, 'translator', 'Logger_Shlink'],
         Action\ListShortCodesAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink'],
diff --git a/module/Rest/config/routes.config.php b/module/Rest/config/routes.config.php
index 1b90fd01..cb06e7ae 100644
--- a/module/Rest/config/routes.config.php
+++ b/module/Rest/config/routes.config.php
@@ -11,7 +11,7 @@ return [
         // Short codes
         Action\ShortCode\CreateShortCodeAction::getRouteDef(),
         Action\ShortCode\SingleStepCreateShortCodeAction::getRouteDef(),
-        Action\EditShortCodeAction::getRouteDef(),
+        Action\ShortCode\EditShortCodeAction::getRouteDef(),
         Action\ResolveUrlAction::getRouteDef(),
         Action\ListShortCodesAction::getRouteDef(),
         Action\EditShortCodeTagsAction::getRouteDef(),
diff --git a/module/Rest/src/Action/EditShortCodeAction.php b/module/Rest/src/Action/ShortCode/EditShortCodeAction.php
similarity index 96%
rename from module/Rest/src/Action/EditShortCodeAction.php
rename to module/Rest/src/Action/ShortCode/EditShortCodeAction.php
index a3a2357f..6a750a62 100644
--- a/module/Rest/src/Action/EditShortCodeAction.php
+++ b/module/Rest/src/Action/ShortCode/EditShortCodeAction.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action;
+namespace Shlinkio\Shlink\Rest\Action\ShortCode;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -9,6 +9,7 @@ use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Core\Exception;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
+use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\EmptyResponse;
 use Zend\Diactoros\Response\JsonResponse;
diff --git a/module/Rest/test/Action/EditShortCodeActionTest.php b/module/Rest/test/Action/EditShortCodeActionTest.php
index 5a4e6b2f..e4107b8b 100644
--- a/module/Rest/test/Action/EditShortCodeActionTest.php
+++ b/module/Rest/test/Action/EditShortCodeActionTest.php
@@ -9,7 +9,7 @@ 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\EditShortCodeAction;
+use Shlinkio\Shlink\Rest\Action\ShortCode\EditShortCodeAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Diactoros\ServerRequestFactory;