diff --git a/src/TypeDescriber/BoolDescriber.php b/src/TypeDescriber/BoolDescriber.php
index 2646928ec..aac3471dd 100644
--- a/src/TypeDescriber/BoolDescriber.php
+++ b/src/TypeDescriber/BoolDescriber.php
@@ -19,6 +19,8 @@
  * @implements TypeDescriberInterface<Type\BuiltinType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class BoolDescriber implements TypeDescriberInterface
 {
diff --git a/src/TypeDescriber/ChainDescriber.php b/src/TypeDescriber/ChainDescriber.php
index 56ea55ee1..7cc5f6297 100644
--- a/src/TypeDescriber/ChainDescriber.php
+++ b/src/TypeDescriber/ChainDescriber.php
@@ -20,6 +20,8 @@
  * @implements TypeDescriberInterface<Type>
  *
  * @experimental
+ *
+ * @internal
  */
 final class ChainDescriber implements TypeDescriberInterface, ModelRegistryAwareInterface
 {
diff --git a/src/TypeDescriber/DictionaryDescriber.php b/src/TypeDescriber/DictionaryDescriber.php
index 24c6f2ac3..42c14337a 100644
--- a/src/TypeDescriber/DictionaryDescriber.php
+++ b/src/TypeDescriber/DictionaryDescriber.php
@@ -22,10 +22,12 @@
  * @implements TypeDescriberInterface<CollectionType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class DictionaryDescriber implements TypeDescriberInterface, TypeDescriberAwareInterface
 {
-    use SchemaDescriberAwareTrait;
+    use TypeDescriberAwareTrait;
 
     public function describe(Type $type, Schema $schema, array $context = []): void
     {
diff --git a/src/TypeDescriber/FloatDescriber.php b/src/TypeDescriber/FloatDescriber.php
index c2dc6a0ef..2ae68b848 100644
--- a/src/TypeDescriber/FloatDescriber.php
+++ b/src/TypeDescriber/FloatDescriber.php
@@ -19,6 +19,8 @@
  * @implements TypeDescriberInterface<Type\BuiltinType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class FloatDescriber implements TypeDescriberInterface
 {
diff --git a/src/TypeDescriber/IntegerDescriber.php b/src/TypeDescriber/IntegerDescriber.php
index ae297a318..e94f81a4e 100644
--- a/src/TypeDescriber/IntegerDescriber.php
+++ b/src/TypeDescriber/IntegerDescriber.php
@@ -19,6 +19,8 @@
  * @implements TypeDescriberInterface<Type\BuiltinType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class IntegerDescriber implements TypeDescriberInterface
 {
diff --git a/src/TypeDescriber/IntersectionDescriber.php b/src/TypeDescriber/IntersectionDescriber.php
index 052ee82ed..24a01a475 100644
--- a/src/TypeDescriber/IntersectionDescriber.php
+++ b/src/TypeDescriber/IntersectionDescriber.php
@@ -22,10 +22,12 @@
  * @implements TypeDescriberInterface<IntersectionType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class IntersectionDescriber implements TypeDescriberInterface, TypeDescriberAwareInterface
 {
-    use SchemaDescriberAwareTrait;
+    use TypeDescriberAwareTrait;
 
     public function describe(Type $type, Schema $schema, array $context = []): void
     {
diff --git a/src/TypeDescriber/ListDescriber.php b/src/TypeDescriber/ListDescriber.php
index e262fd3c2..830dc73e5 100644
--- a/src/TypeDescriber/ListDescriber.php
+++ b/src/TypeDescriber/ListDescriber.php
@@ -22,10 +22,12 @@
  * @implements TypeDescriberInterface<CollectionType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class ListDescriber implements TypeDescriberInterface, TypeDescriberAwareInterface
 {
-    use SchemaDescriberAwareTrait;
+    use TypeDescriberAwareTrait;
 
     public function describe(Type $type, Schema $schema, array $context = []): void
     {
diff --git a/src/TypeDescriber/MixedDescriber.php b/src/TypeDescriber/MixedDescriber.php
index fe06f7a67..a0c993e63 100644
--- a/src/TypeDescriber/MixedDescriber.php
+++ b/src/TypeDescriber/MixedDescriber.php
@@ -20,6 +20,8 @@
  * @implements TypeDescriberInterface<Type\BuiltinType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class MixedDescriber implements TypeDescriberInterface
 {
diff --git a/src/TypeDescriber/NullableDescriber.php b/src/TypeDescriber/NullableDescriber.php
index a76fa72a5..342113a1e 100644
--- a/src/TypeDescriber/NullableDescriber.php
+++ b/src/TypeDescriber/NullableDescriber.php
@@ -18,10 +18,12 @@
  * @implements TypeDescriberInterface<Type>
  *
  * @experimental
+ *
+ * @internal
  */
 final class NullableDescriber implements TypeDescriberInterface, TypeDescriberAwareInterface
 {
-    use SchemaDescriberAwareTrait;
+    use TypeDescriberAwareTrait;
 
     public function describe(Type $type, Schema $schema, array $context = []): void
     {
diff --git a/src/TypeDescriber/ObjectClassDescriber.php b/src/TypeDescriber/ObjectClassDescriber.php
index b709fe319..7c38af9b8 100644
--- a/src/TypeDescriber/ObjectClassDescriber.php
+++ b/src/TypeDescriber/ObjectClassDescriber.php
@@ -25,6 +25,8 @@
  * @implements TypeDescriberInterface<ObjectType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class ObjectClassDescriber implements TypeDescriberInterface, ModelRegistryAwareInterface
 {
diff --git a/src/TypeDescriber/ObjectDescriber.php b/src/TypeDescriber/ObjectDescriber.php
index b0c8d83dc..7ac0c967e 100644
--- a/src/TypeDescriber/ObjectDescriber.php
+++ b/src/TypeDescriber/ObjectDescriber.php
@@ -22,6 +22,8 @@
  * @implements TypeDescriberInterface<BuiltinType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class ObjectDescriber implements TypeDescriberInterface, ModelRegistryAwareInterface
 {
diff --git a/src/TypeDescriber/StringDescriber.php b/src/TypeDescriber/StringDescriber.php
index 9bc5a8799..c84ece84a 100644
--- a/src/TypeDescriber/StringDescriber.php
+++ b/src/TypeDescriber/StringDescriber.php
@@ -19,6 +19,8 @@
  * @implements TypeDescriberInterface<Type\BuiltinType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class StringDescriber implements TypeDescriberInterface
 {
diff --git a/src/TypeDescriber/TypeDescriberAwareInterface.php b/src/TypeDescriber/TypeDescriberAwareInterface.php
index 318cc29b3..94f581b43 100644
--- a/src/TypeDescriber/TypeDescriberAwareInterface.php
+++ b/src/TypeDescriber/TypeDescriberAwareInterface.php
@@ -13,6 +13,8 @@
 
 /**
  * @experimental
+ *
+ * @internal
  */
 interface TypeDescriberAwareInterface
 {
diff --git a/src/TypeDescriber/TypeDescriberAwareTrait.php b/src/TypeDescriber/TypeDescriberAwareTrait.php
index 760efcda3..7141d7fa4 100644
--- a/src/TypeDescriber/TypeDescriberAwareTrait.php
+++ b/src/TypeDescriber/TypeDescriberAwareTrait.php
@@ -13,6 +13,8 @@
 
 /**
  * @experimental
+ *
+ * @internal
  */
 trait TypeDescriberAwareTrait
 {
diff --git a/src/TypeDescriber/TypeDescriberInterface.php b/src/TypeDescriber/TypeDescriberInterface.php
index f2c824872..25c43c158 100644
--- a/src/TypeDescriber/TypeDescriberInterface.php
+++ b/src/TypeDescriber/TypeDescriberInterface.php
@@ -18,6 +18,8 @@
  * @template T of Type
  *
  * @experimental
+ *
+ * @internal
  */
 interface TypeDescriberInterface
 {
diff --git a/src/TypeDescriber/UnionDescriber.php b/src/TypeDescriber/UnionDescriber.php
index 54c9d1b9b..168821f67 100644
--- a/src/TypeDescriber/UnionDescriber.php
+++ b/src/TypeDescriber/UnionDescriber.php
@@ -22,10 +22,12 @@
  * @implements TypeDescriberInterface<UnionType>
  *
  * @experimental
+ *
+ * @internal
  */
 final class UnionDescriber implements TypeDescriberInterface, TypeDescriberAwareInterface
 {
-    use SchemaDescriberAwareTrait;
+    use TypeDescriberAwareTrait;
 
     public function describe(Type $type, Schema $schema, array $context = []): void
     {