diff --git a/src/Metadata/Property/Factory/PropertyInfoPropertyMetadataFactory.php b/src/Metadata/Property/Factory/PropertyInfoPropertyMetadataFactory.php
index ae0fcd957ae..970cb0bc5e9 100644
--- a/src/Metadata/Property/Factory/PropertyInfoPropertyMetadataFactory.php
+++ b/src/Metadata/Property/Factory/PropertyInfoPropertyMetadataFactory.php
@@ -11,9 +11,8 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Metadata\Property;
+namespace ApiPlatform\Metadata\Property\Factory;
 
-use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use ApiPlatform\Core\Metadata\Property\PropertyMetadata;
 use ApiPlatform\Exception\PropertyNotFoundException;
 use ApiPlatform\Metadata\ApiProperty;
diff --git a/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php b/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php
index 2cd1fb7870e..40eacb0095b 100644
--- a/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php
+++ b/src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php
@@ -870,7 +870,8 @@ private function registerLegacyServices(ContainerBuilder $container, array $conf
             'api_platform.metadata.property.metadata_factory.xml' => 'ApiPlatform\Core\Metadata\Property\Factory\ExtractorPropertyMetadataFactory',
             'api_platform.metadata.property.metadata_factory.yaml' => 'ApiPlatform\Core\Metadata\Property\Factory\ExtractorPropertyMetadataFactory',
             'api_platform.metadata.property.metadata_factory.property_info' => 'ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property\PropertyInfoPropertyMetadataFactory',
-            'api_platform.doctrine.orm.metadata.property.metadata_factory' => 'ApiPlatform\Core\Bridge\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory'
+            'api_platform.doctrine.orm.metadata.property.metadata_factory' => 'ApiPlatform\Core\Bridge\Doctrine\Orm\Metadata\Property\DoctrineOrmPropertyMetadataFactory',
+            'api_platform.metadata.property.identifier_metadata_factory.annotation' => 'ApiPlatform\Core\Metadata\Property\Factory\AnnotationPropertyMetadataFactory',
         ];
 
         foreach ($remapDefinitionClasses as $id => $class) {
diff --git a/src/Symfony/Bundle/Resources/config/metadata/resource_collection.xml b/src/Symfony/Bundle/Resources/config/metadata/resource_collection.xml
index ea3cbfe7956..c4b310a9e14 100644
--- a/src/Symfony/Bundle/Resources/config/metadata/resource_collection.xml
+++ b/src/Symfony/Bundle/Resources/config/metadata/resource_collection.xml
@@ -94,7 +94,7 @@
         <!-- Property metadata used to compute identifiers -->
         <service id="api_platform.metadata.property.identifier_metadata_factory" alias="api_platform.metadata.property.identifier_metadata_factory.property_info" />
 
-        <service id="api_platform.metadata.property.identifier_metadata_factory.property_info" class="ApiPlatform\Metadata\Property\PropertyInfoPropertyMetadataFactory" public="false">
+        <service id="api_platform.metadata.property.identifier_metadata_factory.property_info" class="ApiPlatform\Metadata\Property\Factory\PropertyInfoPropertyMetadataFactory" public="false">
             <argument type="service" id="api_platform.property_info" />
         </service>
 
diff --git a/src/deprecation.php b/src/deprecation.php
index a3f5fa2d6ce..911be8d5c25 100644
--- a/src/deprecation.php
+++ b/src/deprecation.php
@@ -247,9 +247,9 @@
         ApiPlatform\Core\Bridge\Symfony\Messenger\DataTransformer::class => ApiPlatform\Symfony\Messenger\DataTransformer::class,
         ApiPlatform\Core\Bridge\Symfony\Messenger\RemoveStamp::class => ApiPlatform\Symfony\Messenger\RemoveStamp::class,
 
-        // Bridge\Symfony\PropertyInfo\Metadata\Property => Metadata\Property
-        ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property\PropertyInfoPropertyMetadataFactory::class => ApiPlatform\Metadata\Property\PropertyInfoPropertyMetadataFactory::class,
-        ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property\PropertyInfoPropertyNameCollectionFactory::class => ApiPlatform\Metadata\Property\PropertyInfoPropertyNameCollectionFactory::class,
+        // Bridge\Symfony\PropertyInfo\Metadata\Property => Metadata\Property\Factory
+        ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property\PropertyInfoPropertyMetadataFactory::class => ApiPlatform\Metadata\Property\Factory\PropertyInfoPropertyMetadataFactory::class,
+        ApiPlatform\Core\Bridge\Symfony\PropertyInfo\Metadata\Property\PropertyInfoPropertyNameCollectionFactory::class => ApiPlatform\Metadata\Property\Factory\PropertyInfoPropertyNameCollectionFactory::class,
 
         // Bridge\Symfony\Routing
         ApiPlatform\Core\Bridge\Symfony\Routing\ApiLoader::class => ApiPlatform\Symfony\Routing\ApiLoader::class,