src/Context/CurrentContext.php              | 4 +---
 src/Context/CurrentContextInterface.php     | 4 +---
 src/Context/FieldResolver.php               | 4 ++--
 src/Context/FieldResolverInterface.php      | 4 ++--
 src/Query/ConditionOption.php               | 4 +---
 src/Query/GroupOption.php                   | 4 +---
 src/Query/OffsetPagerOption.php             | 4 +---
 src/Query/QueryBuilder.php                  | 4 +---
 src/Query/QueryBuilderInterface.php         | 4 +---
 src/Query/QueryOptionInterface.php          | 4 +---
 src/Query/QueryOptionTreeItemInterface.php  | 3 +++
 src/Query/SortOption.php                    | 4 +---
 src/Routing/JsonApiParamEnhancer.php        | 4 +---
 src/Routing/Param/Filter.php                | 4 +---
 src/Routing/Param/JsonApiParamBase.php      | 4 +---
 src/Routing/Param/JsonApiParamInterface.php | 4 +---
 src/Routing/Param/OffsetPage.php            | 4 +---
 src/Routing/Param/Sort.php                  | 4 +---
 src/Routing/RouteEnhancer.php               | 4 +---
 src/Routing/Routes.php                      | 2 ++
 20 files changed, 25 insertions(+), 52 deletions(-)

diff --git a/src/Context/CurrentContext.php b/src/Context/CurrentContext.php
index 48e2c7e..c00f297 100644
--- a/src/Context/CurrentContext.php
+++ b/src/Context/CurrentContext.php
@@ -9,11 +9,9 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
 /**
- * Class CurrentContext.
- *
  * Service for accessing information about the current JSON API request.
  *
- * @package \Drupal\jsonapi\Context
+ * @internal
  */
 class CurrentContext implements CurrentContextInterface {
 
diff --git a/src/Context/CurrentContextInterface.php b/src/Context/CurrentContextInterface.php
index fda80a1..7d4c827 100644
--- a/src/Context/CurrentContextInterface.php
+++ b/src/Context/CurrentContextInterface.php
@@ -8,11 +8,9 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
 /**
- * Interface CurrentContextInterface.
- *
  * An interface for accessing contextual information for the current request.
  *
- * @package \Drupal\jsonapi\Context
+ * @internal
  */
 interface CurrentContextInterface {
 
diff --git a/src/Context/FieldResolver.php b/src/Context/FieldResolver.php
index 108ecde..c972712 100644
--- a/src/Context/FieldResolver.php
+++ b/src/Context/FieldResolver.php
@@ -6,9 +6,9 @@ use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
- * Contains FieldResolver.
- *
  * Service which resolves public field names to and from Drupal field names.
+ *
+ * @internal
  */
 class FieldResolver implements FieldResolverInterface {
 
diff --git a/src/Context/FieldResolverInterface.php b/src/Context/FieldResolverInterface.php
index 92dfcf2..ebc7b6c 100644
--- a/src/Context/FieldResolverInterface.php
+++ b/src/Context/FieldResolverInterface.php
@@ -3,9 +3,9 @@
 namespace Drupal\jsonapi\Context;
 
 /**
- * Contains FieldResolverInterface.
- *
  * Interface for mapping public field names to Drupal field names.
+ *
+ * @internal
  */
 interface FieldResolverInterface {
 
diff --git a/src/Query/ConditionOption.php b/src/Query/ConditionOption.php
index 8f25100..d0886c0 100644
--- a/src/Query/ConditionOption.php
+++ b/src/Query/ConditionOption.php
@@ -3,11 +3,9 @@
 namespace Drupal\jsonapi\Query;
 
 /**
- * Class ConditionOption.
- *
  * A ConditionOption represents an option which can be applied to a query.
  *
- * @package \Drupal\jsonapi\Query\ConditionOption
+ * @internal
  */
 class ConditionOption implements QueryOptionInterface {
 
diff --git a/src/Query/GroupOption.php b/src/Query/GroupOption.php
index 23f47a7..050ba63 100644
--- a/src/Query/GroupOption.php
+++ b/src/Query/GroupOption.php
@@ -3,11 +3,9 @@
 namespace Drupal\jsonapi\Query;
 
 /**
- * Class GroupOption.
- *
  * A GroupOption can group other options before applying them to a query.
  *
- * @package \Drupal\jsonapi\Query\GroupOption
+ * @internal
  */
 class GroupOption implements QueryOptionInterface, QueryOptionTreeItemInterface {
 
diff --git a/src/Query/OffsetPagerOption.php b/src/Query/OffsetPagerOption.php
index d3db2cf..48dc5b9 100644
--- a/src/Query/OffsetPagerOption.php
+++ b/src/Query/OffsetPagerOption.php
@@ -4,9 +4,7 @@ namespace Drupal\jsonapi\Query;
 
 
 /**
- * Class PagerOption.
- *
- * @package Drupal\jsonapi\Query
+ * @internal
  */
 class OffsetPagerOption implements QueryOptionInterface {
 
diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php
index b98d336..82f9b52 100644
--- a/src/Query/QueryBuilder.php
+++ b/src/Query/QueryBuilder.php
@@ -12,9 +12,7 @@ use Drupal\jsonapi\Context\FieldResolverInterface;
 use Drupal\jsonapi\Routing\Param\Sort;
 
 /**
- * Class QueryBuilder.
- *
- * @package Drupal\jsonapi\Query
+ * @internal
  */
 class QueryBuilder implements QueryBuilderInterface {
 
diff --git a/src/Query/QueryBuilderInterface.php b/src/Query/QueryBuilderInterface.php
index 9e788cd..aaea24f 100644
--- a/src/Query/QueryBuilderInterface.php
+++ b/src/Query/QueryBuilderInterface.php
@@ -5,9 +5,7 @@ namespace Drupal\jsonapi\Query;
 use Drupal\Core\Entity\EntityTypeInterface;
 
 /**
- * Interface QueryBuilderInterface.
- *
- * @package Drupal\jsonapi\Query
+ * @internal
  */
 interface QueryBuilderInterface {
 
diff --git a/src/Query/QueryOptionInterface.php b/src/Query/QueryOptionInterface.php
index c0af8e1..91110f0 100644
--- a/src/Query/QueryOptionInterface.php
+++ b/src/Query/QueryOptionInterface.php
@@ -3,9 +3,7 @@
 namespace Drupal\jsonapi\Query;
 
 /**
- * Interface QueryOptionInterface.
- *
- * @package Drupal\jsonapi\Query
+ * @internal
  */
 interface QueryOptionInterface {
 
diff --git a/src/Query/QueryOptionTreeItemInterface.php b/src/Query/QueryOptionTreeItemInterface.php
index e54a257..102921c 100644
--- a/src/Query/QueryOptionTreeItemInterface.php
+++ b/src/Query/QueryOptionTreeItemInterface.php
@@ -2,6 +2,9 @@
 
 namespace Drupal\jsonapi\Query;
 
+/**
+ * @internal
+ */
 interface QueryOptionTreeItemInterface {
 
   /**
diff --git a/src/Query/SortOption.php b/src/Query/SortOption.php
index cc11d72..54901f8 100644
--- a/src/Query/SortOption.php
+++ b/src/Query/SortOption.php
@@ -3,9 +3,7 @@
 namespace Drupal\jsonapi\Query;
 
 /**
- * Class SortOption.
- *
- * @package \Drupal\jsonapi\Query
+ * @internal
  */
 class SortOption implements QueryOptionInterface {
 
diff --git a/src/Routing/JsonApiParamEnhancer.php b/src/Routing/JsonApiParamEnhancer.php
index 2188ada..1c051bf 100644
--- a/src/Routing/JsonApiParamEnhancer.php
+++ b/src/Routing/JsonApiParamEnhancer.php
@@ -12,9 +12,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
 /**
- * Class JsonApiParamEnhancer.
- *
- * @package Drupal\jsonapi\Routing
+ * @internal
  */
 class JsonApiParamEnhancer implements RouteEnhancerInterface {
 
diff --git a/src/Routing/Param/Filter.php b/src/Routing/Param/Filter.php
index 258b5a7..c67e2b9 100644
--- a/src/Routing/Param/Filter.php
+++ b/src/Routing/Param/Filter.php
@@ -5,9 +5,7 @@ namespace Drupal\jsonapi\Routing\Param;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
- * Class Filter.
- *
- * @package Drupal\jsonapi\Routing\Param
+ * @internal
  */
 class Filter extends JsonApiParamBase {
 
diff --git a/src/Routing/Param/JsonApiParamBase.php b/src/Routing/Param/JsonApiParamBase.php
index 9e5939d..21cb503 100644
--- a/src/Routing/Param/JsonApiParamBase.php
+++ b/src/Routing/Param/JsonApiParamBase.php
@@ -3,9 +3,7 @@
 namespace Drupal\jsonapi\Routing\Param;
 
 /**
- * Class JsonApiParamBase.
- *
- * @package Drupal\jsonapi\Routing\Param
+ * @internal
  */
 class JsonApiParamBase implements JsonApiParamInterface {
 
diff --git a/src/Routing/Param/JsonApiParamInterface.php b/src/Routing/Param/JsonApiParamInterface.php
index 54d1d72..71ba223 100644
--- a/src/Routing/Param/JsonApiParamInterface.php
+++ b/src/Routing/Param/JsonApiParamInterface.php
@@ -4,9 +4,7 @@
 namespace Drupal\jsonapi\Routing\Param;
 
 /**
- * Class JsonApiParamInterface.
- *
- * @package Drupal\jsonapi\Routing\Param
+ * @internal
  */
 interface JsonApiParamInterface {
 
diff --git a/src/Routing/Param/OffsetPage.php b/src/Routing/Param/OffsetPage.php
index a10e354..e3c9508 100644
--- a/src/Routing/Param/OffsetPage.php
+++ b/src/Routing/Param/OffsetPage.php
@@ -5,9 +5,7 @@ namespace Drupal\jsonapi\Routing\Param;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
- * Class Page.
- *
- * @package Drupal\jsonapi\Routing\Param
+ * @internal
  */
 class OffsetPage extends JsonApiParamBase {
 
diff --git a/src/Routing/Param/Sort.php b/src/Routing/Param/Sort.php
index 4509475..35f5464 100644
--- a/src/Routing/Param/Sort.php
+++ b/src/Routing/Param/Sort.php
@@ -5,9 +5,7 @@ namespace Drupal\jsonapi\Routing\Param;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
- * Class Sort.
- *
- * @package Drupal\jsonapi\Routing\Param
+ * @internal
  */
 class Sort extends JsonApiParamBase {
 
diff --git a/src/Routing/RouteEnhancer.php b/src/Routing/RouteEnhancer.php
index 352e7e1..1ef97fd 100644
--- a/src/Routing/RouteEnhancer.php
+++ b/src/Routing/RouteEnhancer.php
@@ -9,9 +9,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Route;
 
 /**
- * Class RouteEnhancer.
- *
- * @package Drupal\jsonapi\Routing
+ * @internal
  */
 class RouteEnhancer implements RouteEnhancerInterface {
 
diff --git a/src/Routing/Routes.php b/src/Routing/Routes.php
index 408e0a3..e5fb171 100644
--- a/src/Routing/Routes.php
+++ b/src/Routing/Routes.php
@@ -14,6 +14,8 @@ use Symfony\Component\Routing\RouteCollection;
 
 /**
  * Defines dynamic routes.
+ *
+ * @internal
  */
 class Routes implements ContainerInjectionInterface {