diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php
index 2508b191..d43eed5b 100644
--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@@ -67,7 +67,7 @@ return [
         ],
         'not-found' => [
             'middleware' => [
-                Core\Response\NotFoundHandler::class,
+                Core\ErrorHandler\NotFoundHandler::class,
             ],
         ],
     ],
diff --git a/module/Core/config/dependencies.config.php b/module/Core/config/dependencies.config.php
index 426d0969..55391fa8 100644
--- a/module/Core/config/dependencies.config.php
+++ b/module/Core/config/dependencies.config.php
@@ -6,8 +6,8 @@ namespace Shlinkio\Shlink\Core;
 
 use Doctrine\Common\Cache\Cache;
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Shlinkio\Shlink\Core\ErrorHandler\NotFoundHandler;
 use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
-use Shlinkio\Shlink\Core\Response\NotFoundHandler;
 use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
 use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\Template\TemplateRendererInterface;
diff --git a/module/Core/src/Response/NotFoundHandler.php b/module/Core/src/ErrorHandler/NotFoundHandler.php
similarity index 98%
rename from module/Core/src/Response/NotFoundHandler.php
rename to module/Core/src/ErrorHandler/NotFoundHandler.php
index 7b288b54..e409c906 100644
--- a/module/Core/src/Response/NotFoundHandler.php
+++ b/module/Core/src/ErrorHandler/NotFoundHandler.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Core\Response;
+namespace Shlinkio\Shlink\Core\ErrorHandler;
 
 use Fig\Http\Message\StatusCodeInterface;
 use InvalidArgumentException;
diff --git a/module/Core/test/Response/NotFoundHandlerTest.php b/module/Core/test/ErrorHandler/NotFoundHandlerTest.php
similarity index 97%
rename from module/Core/test/Response/NotFoundHandlerTest.php
rename to module/Core/test/ErrorHandler/NotFoundHandlerTest.php
index 50211229..5806e5ec 100644
--- a/module/Core/test/Response/NotFoundHandlerTest.php
+++ b/module/Core/test/ErrorHandler/NotFoundHandlerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Core\Response;
+namespace ShlinkioTest\Shlink\Core\ErrorHandler;
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -10,8 +10,8 @@ use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Shlinkio\Shlink\Core\Action\RedirectAction;
+use Shlinkio\Shlink\Core\ErrorHandler\NotFoundHandler;
 use Shlinkio\Shlink\Core\Options\NotFoundRedirectOptions;
-use Shlinkio\Shlink\Core\Response\NotFoundHandler;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Uri;