diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
index f7661c1573..e5df6c8b81 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
+++ b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
@@ -47,7 +47,7 @@
Symfony\Bundle\DoctrineBundle\CacheWarmer\ProxyCacheWarmer
- Symfony\Component\Form\Extension\Doctrine\EntityFieldFactoryGuesser
+ Symfony\Component\Form\FieldFactory\EntityFieldFactoryGuesser
diff --git a/src/Symfony/Component/Form/FieldFactory/EntityFieldFactoryGuesser.php b/src/Symfony/Component/Form/FieldFactory/EntityFieldFactoryGuesser.php
index f103ed6846..6200519b29 100644
--- a/src/Symfony/Component/Form/FieldFactory/EntityFieldFactoryGuesser.php
+++ b/src/Symfony/Component/Form/FieldFactory/EntityFieldFactoryGuesser.php
@@ -61,7 +61,7 @@ class EntityFieldFactoryGuesser implements FieldFactoryGuesserInterface
$mapping = $metadata->getAssociationMapping($property);
return new FieldFactoryClassGuess(
- 'Symfony\Component\Form\Extension\Doctrine\EntityChoiceField',
+ 'Symfony\Component\Form\EntityChoiceField',
array(
'em' => $this->em,
'class' => $mapping['targetEntity'],