diff --git a/module/Rest/config/dependencies.config.php b/module/Rest/config/dependencies.config.php
index 8b8a4f02..595377d7 100644
--- a/module/Rest/config/dependencies.config.php
+++ b/module/Rest/config/dependencies.config.php
@@ -37,7 +37,7 @@ return [
             Middleware\CrossDomainMiddleware::class => InvokableFactory::class,
             Middleware\PathVersionMiddleware::class => InvokableFactory::class,
             Middleware\CheckAuthenticationMiddleware::class => ConfigAbstractFactory::class,
-            Middleware\ShortCode\CreateShortCodeContentNegotiationMiddleware::class => InvokableFactory::class,
+            Middleware\ShortUrl\CreateShortUrlContentNegotiationMiddleware::class => InvokableFactory::class,
         ],
     ],
 
diff --git a/module/Rest/config/routes.config.php b/module/Rest/config/routes.config.php
index b1ab3d78..a937bc42 100644
--- a/module/Rest/config/routes.config.php
+++ b/module/Rest/config/routes.config.php
@@ -12,10 +12,10 @@ return [
 
         // Short codes
         Action\ShortUrl\CreateShortUrlAction::getRouteDef([
-            Middleware\ShortCode\CreateShortCodeContentNegotiationMiddleware::class,
+            Middleware\ShortUrl\CreateShortUrlContentNegotiationMiddleware::class,
         ]),
         Action\ShortUrl\SingleStepCreateShortUrlAction::getRouteDef([
-            Middleware\ShortCode\CreateShortCodeContentNegotiationMiddleware::class,
+            Middleware\ShortUrl\CreateShortUrlContentNegotiationMiddleware::class,
         ]),
         Action\ShortUrl\EditShortUrlAction::getRouteDef(),
         Action\ShortUrl\DeleteShortUrlAction::getRouteDef(),
diff --git a/module/Rest/src/Middleware/ShortCode/CreateShortCodeContentNegotiationMiddleware.php b/module/Rest/src/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddleware.php
similarity index 94%
rename from module/Rest/src/Middleware/ShortCode/CreateShortCodeContentNegotiationMiddleware.php
rename to module/Rest/src/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddleware.php
index 3a2f0f4d..8ea8f259 100644
--- a/module/Rest/src/Middleware/ShortCode/CreateShortCodeContentNegotiationMiddleware.php
+++ b/module/Rest/src/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddleware.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Middleware\ShortCode;
+namespace Shlinkio\Shlink\Rest\Middleware\ShortUrl;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -10,7 +10,7 @@ use Psr\Http\Server\RequestHandlerInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Response\JsonResponse;
 
-class CreateShortCodeContentNegotiationMiddleware implements MiddlewareInterface
+class CreateShortUrlContentNegotiationMiddleware implements MiddlewareInterface
 {
     private const PLAIN_TEXT = 'text';
     private const JSON = 'json';
diff --git a/module/Rest/test/Middleware/ShortCode/CreateShortCodeContentNegotiationMiddlewareTest.php b/module/Rest/test/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddlewareTest.php
similarity index 90%
rename from module/Rest/test/Middleware/ShortCode/CreateShortCodeContentNegotiationMiddlewareTest.php
rename to module/Rest/test/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddlewareTest.php
index 450b9e1c..bb2dc7ad 100644
--- a/module/Rest/test/Middleware/ShortCode/CreateShortCodeContentNegotiationMiddlewareTest.php
+++ b/module/Rest/test/Middleware/ShortUrl/CreateShortUrlContentNegotiationMiddlewareTest.php
@@ -1,21 +1,21 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Rest\Middleware\ShortCode;
+namespace ShlinkioTest\Shlink\Rest\Middleware\ShortUrl;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Shlinkio\Shlink\Rest\Middleware\ShortCode\CreateShortCodeContentNegotiationMiddleware;
+use Shlinkio\Shlink\Rest\Middleware\ShortUrl\CreateShortUrlContentNegotiationMiddleware;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Diactoros\ServerRequestFactory;
 
-class CreateShortCodeContentNegotiationMiddlewareTest extends TestCase
+class CreateShortUrlContentNegotiationMiddlewareTest extends TestCase
 {
     /**
-     * @var CreateShortCodeContentNegotiationMiddleware
+     * @var CreateShortUrlContentNegotiationMiddleware
      */
     private $middleware;
     /**
@@ -25,7 +25,7 @@ class CreateShortCodeContentNegotiationMiddlewareTest extends TestCase
 
     public function setUp()
     {
-        $this->middleware = new CreateShortCodeContentNegotiationMiddleware();
+        $this->middleware = new CreateShortUrlContentNegotiationMiddleware();
         $this->requestHandler = $this->prophesize(RequestHandlerInterface::class);
     }