diff --git a/core/bootstrap.md b/core/bootstrap.md
index 21bab4c747d..68c6906ba8c 100644
--- a/core/bootstrap.md
+++ b/core/bootstrap.md
@@ -23,12 +23,12 @@ use ApiPlatform\Action\EntrypointAction;
 use ApiPlatform\Action\ExceptionAction;
 use ApiPlatform\Action\NotExposedAction;
 use ApiPlatform\Action\PlaceholderAction;
-use ApiPlatform\Api\IdentifiersExtractor;
-use ApiPlatform\Api\ResourceClassResolver;
-use ApiPlatform\Api\UriVariablesConverter;
-use ApiPlatform\Api\UriVariableTransformer\DateTimeUriVariableTransformer;
-use ApiPlatform\Api\UriVariableTransformer\IntegerUriVariableTransformer;
-use ApiPlatform\Api\UrlGeneratorInterface as ApiUrlGeneratorInterface;
+use ApiPlatform\Metadata\IdentifiersExtractor;
+use ApiPlatform\Metadata\ResourceClassResolver;
+use ApiPlatform\Metadata\UriVariablesConverter;
+use ApiPlatform\Metadata\UriVariableTransformer\DateTimeUriVariableTransformer;
+use ApiPlatform\Metadata\UriVariableTransformer\IntegerUriVariableTransformer;
+use ApiPlatform\Metadata\UrlGeneratorInterface as ApiUrlGeneratorInterface;
 use ApiPlatform\Symfony\Validator\EventListener\ValidationExceptionListener;
 use ApiPlatform\Documentation\DocumentationInterface;
 use ApiPlatform\Symfony\EventListener\AddFormatListener;
diff --git a/core/configuration.md b/core/configuration.md
index 55a0e4d3bdb..0d55bd5c506 100644
--- a/core/configuration.md
+++ b/core/configuration.md
@@ -374,7 +374,7 @@ api_platform:
     host: ~
 
     # The URL generation strategy to use for IRIs
-    url_generation_strategy: !php/const ApiPlatform\Api\UrlGeneratorInterface::ABS_PATH
+    url_generation_strategy: !php/const ApiPlatform\Metadata\UrlGeneratorInterface::ABS_PATH
 
     # To enable collecting denormalization errors
     collectDenormalizationErrors: false
@@ -711,7 +711,7 @@ If you need to globally configure all the resources instead of adding configurat
 <?php
 // config/api-platform.php
 
-use ApiPlatform\Api\UrlGeneratorInterface;
+use ApiPlatform\Metadata\UrlGeneratorInterface;
 
 return [
     'defaults' => [
diff --git a/core/filters.md b/core/filters.md
index cdd61c7b6fb..80f27ec145e 100644
--- a/core/filters.md
+++ b/core/filters.md
@@ -343,7 +343,7 @@ If you want to include some properties of the nested "author" document, use: `/b
 
 ## Creating Custom Filters
 
-Custom filters can be written by implementing the `ApiPlatform\Api\FilterInterface` interface.
+Custom filters can be written by implementing the `ApiPlatform\Metadata\FilterInterface` interface.
 
 API Platform provides a convenient way to create Doctrine ORM and MongoDB ODM filters. If you use [custom state providers](state-providers.md),
 you can still create filters by implementing the previously mentioned interface, but - as API Platform isn't aware of your
diff --git a/core/identifiers.md b/core/identifiers.md
index 07a383c4fdc..2953fbe969c 100644
--- a/core/identifiers.md
+++ b/core/identifiers.md
@@ -96,7 +96,7 @@ This case is covered by an URI variable transformer:
 // api/src/Identifier/UuidUriVariableTransformer.php with Symfony
 namespace App\Identifier;
 
-use ApiPlatform\Api\UriVariableTransformerInterface;
+use ApiPlatform\Metadata\UriVariableTransformerInterface;
 use ApiPlatform\Exception\InvalidUriVariableException;
 use App\Uuid;
 
diff --git a/core/mercure.md b/core/mercure.md
index 11bea20a9c1..a8748656a38 100644
--- a/core/mercure.md
+++ b/core/mercure.md
@@ -133,7 +133,7 @@ Below is an example using the `topics` option:
 namespace App\ApiResource;
 
 use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Api\UrlGeneratorInterface;
+use ApiPlatform\Metadata\UrlGeneratorInterface;
 use App\ApiResource\User;
 
 #[ApiResource(
diff --git a/core/serialization.md b/core/serialization.md
index 4f0c780f28c..703870c0b19 100644
--- a/core/serialization.md
+++ b/core/serialization.md
@@ -648,7 +648,7 @@ Instead of sending an IRI to set a relation, you may want to send a plain identi
 
 namespace App\Serializer;
 
-use ApiPlatform\Api\IriConverterInterface;
+use ApiPlatform\Metadata\IriConverterInterface;
 use App\ApiResource\Dummy;
 use App\ApiResource\RelatedDummy;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
diff --git a/core/url-generation-strategy.md b/core/url-generation-strategy.md
index e918663680c..b997b85d64a 100644
--- a/core/url-generation-strategy.md
+++ b/core/url-generation-strategy.md
@@ -32,7 +32,7 @@ It can be configured globally using one of the configurations below:
 # api/config/packages/api_platform.yaml
 api_platform:
   defaults:
-    url_generation_strategy: !php/const ApiPlatform\Api\UrlGeneratorInterface::ABS_URL
+    url_generation_strategy: !php/const ApiPlatform\Metadata\UrlGeneratorInterface::ABS_URL
 ```
 ### Configure URL Generation Globally using Laravel
 
@@ -42,7 +42,7 @@ api_platform:
 return [
     // ....
     'defaults' => [
-        'url_generation_strategy' => ApiPlatform\Api\UrlGeneratorInterface::ABS_URL
+        'url_generation_strategy' => ApiPlatform\Metadata\UrlGeneratorInterface::ABS_URL
     ],
 ];
 ```
@@ -60,7 +60,7 @@ It can also be configured only for a specific resource:
 namespace App\ApiResource;
 
 use ApiPlatform\Metadata\ApiResource;
-use ApiPlatform\Api\UrlGeneratorInterface;
+use ApiPlatform\Metadata\UrlGeneratorInterface;
 
 #[ApiResource(urlGenerationStrategy: UrlGeneratorInterface::ABS_URL)]
 class Book