diff --git a/module/Rest/config/error-handler.config.php b/module/Rest/config/error-handler.config.php
index fef71303..cb06f6bf 100644
--- a/module/Rest/config/error-handler.config.php
+++ b/module/Rest/config/error-handler.config.php
@@ -1,12 +1,12 @@
 <?php
-use Shlinkio\Shlink\Rest\ErrorHandler\JsonErrorHandler;
+use Shlinkio\Shlink\Rest\ErrorHandler\JsonErrorResponseGenerator;
 
 return [
 
     'error_handler' => [
         'plugins' => [
             'invokables' => [
-                'application/json' => JsonErrorHandler::class,
+                'application/json' => JsonErrorResponseGenerator::class,
             ],
             'aliases' => [
                 'application/x-json' => 'application/json',
diff --git a/module/Rest/src/ErrorHandler/JsonErrorHandler.php b/module/Rest/src/ErrorHandler/JsonErrorResponseGenerator.php
similarity index 92%
rename from module/Rest/src/ErrorHandler/JsonErrorHandler.php
rename to module/Rest/src/ErrorHandler/JsonErrorResponseGenerator.php
index 3dc55e8b..0f26957c 100644
--- a/module/Rest/src/ErrorHandler/JsonErrorHandler.php
+++ b/module/Rest/src/ErrorHandler/JsonErrorResponseGenerator.php
@@ -8,7 +8,7 @@ use Psr\Http\Message\ServerRequestInterface as Request;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Expressive\Router\RouteResult;
 
-class JsonErrorHandler implements ErrorResponseGeneratorInterface, StatusCodeInterface
+class JsonErrorResponseGenerator implements ErrorResponseGeneratorInterface, StatusCodeInterface
 {
     /**
      * Final handler for an application.
diff --git a/module/Rest/test/ErrorHandler/JsonErrorHandlerTest.php b/module/Rest/test/ErrorHandler/JsonErrorResponseGeneratorTest.php
similarity index 81%
rename from module/Rest/test/ErrorHandler/JsonErrorHandlerTest.php
rename to module/Rest/test/ErrorHandler/JsonErrorResponseGeneratorTest.php
index 75d4ad0e..164ce6eb 100644
--- a/module/Rest/test/ErrorHandler/JsonErrorHandlerTest.php
+++ b/module/Rest/test/ErrorHandler/JsonErrorResponseGeneratorTest.php
@@ -2,20 +2,20 @@
 namespace ShlinkioTest\Shlink\Rest\ErrorHandler;
 
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Rest\ErrorHandler\JsonErrorHandler;
+use Shlinkio\Shlink\Rest\ErrorHandler\JsonErrorResponseGenerator;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequestFactory;
 
-class JsonErrorHandlerTest extends TestCase
+class JsonErrorResponseGeneratorTest extends TestCase
 {
     /**
-     * @var JsonErrorHandler
+     * @var JsonErrorResponseGenerator
      */
     protected $errorHandler;
 
     public function setUp()
     {
-        $this->errorHandler = new JsonErrorHandler();
+        $this->errorHandler = new JsonErrorResponseGenerator();
     }
 
     /**