diff --git a/module/Rest/config/dependencies.config.php b/module/Rest/config/dependencies.config.php
index 273399da..cb946f85 100644
--- a/module/Rest/config/dependencies.config.php
+++ b/module/Rest/config/dependencies.config.php
@@ -23,7 +23,7 @@ return [
             Action\ShortCode\CreateShortCodeAction::class => ConfigAbstractFactory::class,
             Action\ShortCode\SingleStepCreateShortCodeAction::class => ConfigAbstractFactory::class,
             Action\ShortCode\EditShortCodeAction::class => ConfigAbstractFactory::class,
-            Action\ResolveUrlAction::class => ConfigAbstractFactory::class,
+            Action\ShortCode\ResolveUrlAction::class => ConfigAbstractFactory::class,
             Action\GetVisitsAction::class => ConfigAbstractFactory::class,
             Action\ShortCode\ListShortCodesAction::class => ConfigAbstractFactory::class,
             Action\EditShortCodeTagsAction::class => ConfigAbstractFactory::class,
@@ -58,7 +58,7 @@ return [
             'Logger_Shlink',
         ],
         Action\ShortCode\EditShortCodeAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink',],
-        Action\ResolveUrlAction::class => [Service\UrlShortener::class, 'translator'],
+        Action\ShortCode\ResolveUrlAction::class => [Service\UrlShortener::class, 'translator'],
         Action\GetVisitsAction::class => [Service\VisitsTracker::class, 'translator', 'Logger_Shlink'],
         Action\ShortCode\ListShortCodesAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink'],
         Action\EditShortCodeTagsAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink'],
diff --git a/module/Rest/config/routes.config.php b/module/Rest/config/routes.config.php
index d652bfb4..27075685 100644
--- a/module/Rest/config/routes.config.php
+++ b/module/Rest/config/routes.config.php
@@ -12,7 +12,7 @@ return [
         Action\ShortCode\CreateShortCodeAction::getRouteDef(),
         Action\ShortCode\SingleStepCreateShortCodeAction::getRouteDef(),
         Action\ShortCode\EditShortCodeAction::getRouteDef(),
-        Action\ResolveUrlAction::getRouteDef(),
+        Action\ShortCode\ResolveUrlAction::getRouteDef(),
         Action\ShortCode\ListShortCodesAction::getRouteDef(),
         Action\EditShortCodeTagsAction::getRouteDef(),
 
diff --git a/module/Rest/src/Action/ResolveUrlAction.php b/module/Rest/src/Action/ShortCode/ResolveUrlAction.php
similarity index 96%
rename from module/Rest/src/Action/ResolveUrlAction.php
rename to module/Rest/src/Action/ShortCode/ResolveUrlAction.php
index 34bcd651..8a7f2ba7 100644
--- a/module/Rest/src/Action/ResolveUrlAction.php
+++ b/module/Rest/src/Action/ShortCode/ResolveUrlAction.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 as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -9,6 +9,7 @@ use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
+use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\I18n\Translator\TranslatorInterface;
diff --git a/module/Rest/test/Action/ResolveUrlActionTest.php b/module/Rest/test/Action/ResolveUrlActionTest.php
index feafc425..f4511d65 100644
--- a/module/Rest/test/Action/ResolveUrlActionTest.php
+++ b/module/Rest/test/Action/ResolveUrlActionTest.php
@@ -8,7 +8,7 @@ use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
-use Shlinkio\Shlink\Rest\Action\ResolveUrlAction;
+use Shlinkio\Shlink\Rest\Action\ShortCode\ResolveUrlAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;