diff --git a/src/Context/FieldResolver.php b/src/Context/FieldResolver.php
index b2adcd3..9eab90d 100644
--- a/src/Context/FieldResolver.php
+++ b/src/Context/FieldResolver.php
@@ -3,7 +3,7 @@
 namespace Drupal\jsonapi\Context;
 
 use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 
 /**
  * Service which resolves public field names to and from Drupal field names.
diff --git a/src/Controller/EntityResource.php b/src/Controller/EntityResource.php
index 03eb30c..92cc17b 100644
--- a/src/Controller/EntityResource.php
+++ b/src/Controller/EntityResource.php
@@ -18,8 +18,8 @@ use Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem;
 use Drupal\jsonapi\Resource\EntityCollection;
 use Drupal\jsonapi\Resource\JsonApiDocumentTopLevel;
 use Drupal\jsonapi\ResourceType\ResourceType;
-use Drupal\jsonapi\Error\SerializableHttpException;
-use Drupal\jsonapi\Error\UnprocessableHttpEntityException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
+use Drupal\jsonapi\Exception\UnprocessableHttpEntityException;
 use Drupal\jsonapi\Query\QueryBuilder;
 use Drupal\jsonapi\Context\CurrentContext;
 use Drupal\jsonapi\ResourceResponse;
@@ -129,7 +129,7 @@ class EntityResource {
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity object.
    *
-   * @throws \Drupal\jsonapi\Error\SerializableHttpException
+   * @throws \Drupal\jsonapi\Exception\SerializableHttpException
    *   If validation errors are found.
    */
   protected function validate(EntityInterface $entity) {
diff --git a/src/Controller/RequestHandler.php b/src/Controller/RequestHandler.php
index c4616b0..c318b5a 100644
--- a/src/Controller/RequestHandler.php
+++ b/src/Controller/RequestHandler.php
@@ -7,7 +7,7 @@ use Drupal\Core\Render\RenderContext;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\jsonapi\Context\CurrentContext;
 use Drupal\jsonapi\Error\ErrorHandler;
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 use Drupal\jsonapi\ResourceResponse;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
diff --git a/src/EventSubscriber/DefaultExceptionSubscriber.php b/src/EventSubscriber/DefaultExceptionSubscriber.php
index 55c1a8d..fb21a3e 100644
--- a/src/EventSubscriber/DefaultExceptionSubscriber.php
+++ b/src/EventSubscriber/DefaultExceptionSubscriber.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\jsonapi\EventSubscriber;
 
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 use Drupal\serialization\EventSubscriber\DefaultExceptionSubscriber as SerializationDefaultExceptionSubscriber;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
diff --git a/src/Error/SerializableHttpException.php b/src/Exception/SerializableHttpException.php
similarity index 87%
rename from src/Error/SerializableHttpException.php
rename to src/Exception/SerializableHttpException.php
index 91b0732..3aaa117 100644
--- a/src/Error/SerializableHttpException.php
+++ b/src/Exception/SerializableHttpException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\jsonapi\Error;
+namespace Drupal\jsonapi\Exception;
 
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Symfony\Component\HttpKernel\Exception\HttpException;
diff --git a/src/Error/UnprocessableHttpEntityException.php b/src/Exception/UnprocessableHttpEntityException.php
similarity index 97%
rename from src/Error/UnprocessableHttpEntityException.php
rename to src/Exception/UnprocessableHttpEntityException.php
index 032a382..7730f5f 100644
--- a/src/Error/UnprocessableHttpEntityException.php
+++ b/src/Exception/UnprocessableHttpEntityException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\jsonapi\Error;
+namespace Drupal\jsonapi\Exception;
 
 use Drupal\Core\Entity\EntityConstraintViolationListInterface;
 
diff --git a/src/LinkManager/LinkManager.php b/src/LinkManager/LinkManager.php
index b8875ed..b3f6d03 100644
--- a/src/LinkManager/LinkManager.php
+++ b/src/LinkManager/LinkManager.php
@@ -4,7 +4,7 @@ namespace Drupal\jsonapi\LinkManager;
 
 use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\jsonapi\ResourceType\ResourceType;
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 use Drupal\jsonapi\Routing\Param\OffsetPage;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -97,7 +97,7 @@ class LinkManager {
    * @param array $link_context
    *   An associative array with extra data to build the links.
    *
-   * @throws \Drupal\jsonapi\Error\SerializableHttpException
+   * @throws \Drupal\jsonapi\Exception\SerializableHttpException
    *   When the offset and size are invalid.
    *
    * @return string[]
diff --git a/src/Normalizer/EntityNormalizer.php b/src/Normalizer/EntityNormalizer.php
index f052198..7958248 100644
--- a/src/Normalizer/EntityNormalizer.php
+++ b/src/Normalizer/EntityNormalizer.php
@@ -9,7 +9,7 @@ use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\EntityReferenceFieldItemList;
 use Drupal\jsonapi\Normalizer\Value\EntityNormalizerValue;
 use Drupal\jsonapi\ResourceType\ResourceType;
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 use Drupal\jsonapi\LinkManager\LinkManager;
 use Drupal\jsonapi\Normalizer\Value\NullFieldNormalizerValue;
 use Drupal\jsonapi\ResourceType\ResourceTypeRepository;
diff --git a/src/Normalizer/EntityReferenceFieldNormalizer.php b/src/Normalizer/EntityReferenceFieldNormalizer.php
index 9ca2095..bdddd71 100644
--- a/src/Normalizer/EntityReferenceFieldNormalizer.php
+++ b/src/Normalizer/EntityReferenceFieldNormalizer.php
@@ -9,7 +9,7 @@ use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Field\TypedData\FieldItemDataDefinition;
 use Drupal\jsonapi\ResourceType\ResourceTypeRepository;
 use Drupal\jsonapi\Resource\EntityCollection;
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 use Drupal\jsonapi\LinkManager\LinkManager;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
diff --git a/src/Normalizer/UnprocessableHttpEntityExceptionNormalizer.php b/src/Normalizer/UnprocessableHttpEntityExceptionNormalizer.php
index 556defa..2326d81 100644
--- a/src/Normalizer/UnprocessableHttpEntityExceptionNormalizer.php
+++ b/src/Normalizer/UnprocessableHttpEntityExceptionNormalizer.php
@@ -3,7 +3,7 @@
 namespace Drupal\jsonapi\Normalizer;
 
 use Drupal\Core\Session\AccountProxyInterface;
-use Drupal\jsonapi\Error\UnprocessableHttpEntityException;
+use Drupal\jsonapi\Exception\UnprocessableHttpEntityException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 /**
@@ -37,7 +37,7 @@ class UnprocessableHttpEntityExceptionNormalizer extends HttpExceptionNormalizer
    * {@inheritdoc}
    */
   protected function buildErrorObjects(HttpException $exception) {
-    /** @var $exception \Drupal\jsonapi\Error\UnprocessableHttpEntityException */
+    /** @var $exception \Drupal\jsonapi\Exception\UnprocessableHttpEntityException */
     $errors = parent::buildErrorObjects($exception);
     $error = $errors[0];
     unset($error['links']);
diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php
index f439aa5..0e84c03 100644
--- a/src/Query/QueryBuilder.php
+++ b/src/Query/QueryBuilder.php
@@ -4,7 +4,7 @@ namespace Drupal\jsonapi\Query;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 use Drupal\jsonapi\Routing\Param\OffsetPage;
 use Drupal\jsonapi\Routing\Param\Filter;
 use Drupal\jsonapi\Routing\Param\JsonApiParamInterface;
diff --git a/src/Routing/Param/Filter.php b/src/Routing/Param/Filter.php
index 3869db3..2033473 100644
--- a/src/Routing/Param/Filter.php
+++ b/src/Routing/Param/Filter.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace Drupal\jsonapi\Routing\Param;
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 
 /**
  * @internal
diff --git a/src/Routing/Param/OffsetPage.php b/src/Routing/Param/OffsetPage.php
index 2217e16..e2b3feb 100644
--- a/src/Routing/Param/OffsetPage.php
+++ b/src/Routing/Param/OffsetPage.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace Drupal\jsonapi\Routing\Param;
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 
 /**
  * @internal
diff --git a/src/Routing/Param/Sort.php b/src/Routing/Param/Sort.php
index 3e78b4e..e0aac10 100644
--- a/src/Routing/Param/Sort.php
+++ b/src/Routing/Param/Sort.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\jsonapi\Routing\Param;
 
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 
 /**
  * @internal
diff --git a/src/Routing/RouteEnhancer.php b/src/Routing/RouteEnhancer.php
index b9844a0..9ee019d 100644
--- a/src/Routing/RouteEnhancer.php
+++ b/src/Routing/RouteEnhancer.php
@@ -3,7 +3,7 @@
 namespace Drupal\jsonapi\Routing;
 
 use Drupal\Core\Routing\Enhancer\RouteEnhancerInterface;
-use Drupal\jsonapi\Error\SerializableHttpException;
+use Drupal\jsonapi\Exception\SerializableHttpException;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
diff --git a/tests/src/Kernel/Controller/EntityResourceTest.php b/tests/src/Kernel/Controller/EntityResourceTest.php
index aff2c58..93e8609 100644
--- a/tests/src/Kernel/Controller/EntityResourceTest.php
+++ b/tests/src/Kernel/Controller/EntityResourceTest.php
@@ -166,7 +166,7 @@ class EntityResourceTest extends JsonapiKernelTestBase {
 
   /**
    * @covers ::getIndividual
-   * @expectedException \Drupal\jsonapi\Error\SerializableHttpException
+   * @expectedException \Drupal\jsonapi\Exception\SerializableHttpException
    */
   public function testGetIndividualDenied() {
     $role = Role::load(RoleInterface::ANONYMOUS_ID);
diff --git a/tests/src/Unit/Context/FieldResolverTest.php b/tests/src/Unit/Context/FieldResolverTest.php
index 12fa6b0..0fe7e6c 100644
--- a/tests/src/Unit/Context/FieldResolverTest.php
+++ b/tests/src/Unit/Context/FieldResolverTest.php
@@ -97,7 +97,7 @@ class FieldResolverTest extends UnitTestCase {
    *
    * @covers ::resolveInternal
    *
-   * @expectedException \Drupal\jsonapi\Error\SerializableHttpException
+   * @expectedException \Drupal\jsonapi\Exception\SerializableHttpException
    */
   public function testResolveInternalError() {
     $field_manager = $this->prophesize(EntityFieldManagerInterface::class);
diff --git a/tests/src/Unit/LinkManager/LinkManagerTest.php b/tests/src/Unit/LinkManager/LinkManagerTest.php
index 65ccefe..996e59c 100644
--- a/tests/src/Unit/LinkManager/LinkManagerTest.php
+++ b/tests/src/Unit/LinkManager/LinkManagerTest.php
@@ -120,7 +120,7 @@ class LinkManagerTest extends UnitTestCase {
    * Test errors.
    *
    * @covers ::getPagerLinks
-   * @expectedException \Drupal\jsonapi\Error\SerializableHttpException
+   * @expectedException \Drupal\jsonapi\Exception\SerializableHttpException
    * @dataProvider getPagerLinksErrorProvider
    */
   public function testGetPagerLinksError($offset, $size, $total, array $pages) {
diff --git a/tests/src/Unit/Normalizer/EntityReferenceFieldNormalizerTest.php b/tests/src/Unit/Normalizer/EntityReferenceFieldNormalizerTest.php
index 144ffc6..2f27c5d 100644
--- a/tests/src/Unit/Normalizer/EntityReferenceFieldNormalizerTest.php
+++ b/tests/src/Unit/Normalizer/EntityReferenceFieldNormalizerTest.php
@@ -130,7 +130,7 @@ class EntityReferenceFieldNormalizerTest extends UnitTestCase {
 
   /**
    * @covers ::denormalize
-   * @expectedException \Drupal\jsonapi\Error\SerializableHttpException
+   * @expectedException \Drupal\jsonapi\Exception\SerializableHttpException
    * @dataProvider denormalizeInvalidResourceProvider
    */
   public function testDenormalizeInvalidResource($data, $field_name) {
diff --git a/tests/src/Unit/Routing/Param/FilterTest.php b/tests/src/Unit/Routing/Param/FilterTest.php
index ebddb20..15b1928 100644
--- a/tests/src/Unit/Routing/Param/FilterTest.php
+++ b/tests/src/Unit/Routing/Param/FilterTest.php
@@ -87,7 +87,7 @@ class FilterTest extends UnitTestCase {
 
   /**
    * @covers ::get
-   * @expectedException \Drupal\jsonapi\Error\SerializableHttpException
+   * @expectedException \Drupal\jsonapi\Exception\SerializableHttpException
    */
   public function testGetFail() {
     $pager = new Filter(
diff --git a/tests/src/Unit/Routing/Param/OffsetPageTest.php b/tests/src/Unit/Routing/Param/OffsetPageTest.php
index a5fb407..c23e5e0 100644
--- a/tests/src/Unit/Routing/Param/OffsetPageTest.php
+++ b/tests/src/Unit/Routing/Param/OffsetPageTest.php
@@ -35,7 +35,7 @@ class OffsetPageTest extends UnitTestCase {
 
   /**
    * @covers ::get
-   * @expectedException \Drupal\jsonapi\Error\SerializableHttpException
+   * @expectedException \Drupal\jsonapi\Exception\SerializableHttpException
    */
   public function testGetFail() {
     $pager = new OffsetPage('lorem');
diff --git a/tests/src/Unit/Routing/Param/SortTest.php b/tests/src/Unit/Routing/Param/SortTest.php
index 5774029..a407ea5 100644
--- a/tests/src/Unit/Routing/Param/SortTest.php
+++ b/tests/src/Unit/Routing/Param/SortTest.php
@@ -52,7 +52,7 @@ class SortTest extends UnitTestCase {
   /**
    * @covers ::get
    * @dataProvider getFailProvider
-   * @expectedException \Drupal\jsonapi\Error\SerializableHttpException
+   * @expectedException \Drupal\jsonapi\Exception\SerializableHttpException
    */
   public function testGetFail($input) {
     $sort = new Sort($input);