diff --git a/tests/Doctrine/EntityRegeneratorTest.php b/tests/Doctrine/EntityRegeneratorTest.php
index 8b5e7f250..154614ea0 100644
--- a/tests/Doctrine/EntityRegeneratorTest.php
+++ b/tests/Doctrine/EntityRegeneratorTest.php
@@ -33,15 +33,16 @@ public function testRegenerateEntities(string $expectedDirName, bool $overwrite)
         $this->doTestRegeneration(
             __DIR__.'/fixtures/source_project',
             $kernel,
-            'Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity',
+            'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',
             $expectedDirName,
-            $overwrite
+            $overwrite,
+            'current_project'
         );
     }
 
     public function getRegenerateEntitiesTests()
     {
-        yield 'regnerate_no_overwrite' => [
+        yield 'regenerate_no_overwrite' => [
             'expected_no_overwrite',
             false
         ];
@@ -58,16 +59,17 @@ public function testXmlRegeneration()
         $this->doTestRegeneration(
             __DIR__.'/fixtures/xml_source_project',
             $kernel,
-            'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',
+            'Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity',
             'expected_xml',
-            false
+            false,
+            'current_project_xml'
         );
     }
 
-    private function doTestRegeneration(string $sourceDir, Kernel $kernel, string $namespace, string $expectedDirName, bool $overwrite)
+    private function doTestRegeneration(string $sourceDir, Kernel $kernel, string $namespace, string $expectedDirName, bool $overwrite, string $targetDirName)
     {
         $fs = new Filesystem();
-        $tmpDir = __DIR__.'/../tmp/current_project';
+        $tmpDir = __DIR__.'/../tmp/'.$targetDirName;
         $fs->remove($tmpDir);
 
         // if traits (Timestampable, Teamable) gets copied into new project, tests will fail because of double exclusion
@@ -79,8 +81,8 @@ private function doTestRegeneration(string $sourceDir, Kernel $kernel, string $n
         $autoloaderUtil = $this->createMock(AutoloaderUtil::class);
         $autoloaderUtil->expects($this->any())
             ->method('getPathForFutureClass')
-            ->willReturnCallback(function($className) use ($tmpDir) {
-                $shortClassName = str_replace('Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\\', '', $className);
+            ->willReturnCallback(function($className) use ($tmpDir, $targetDirName) {
+                $shortClassName = str_replace('Symfony\Bundle\MakerBundle\Tests\tmp\\'.$targetDirName.'\src\\', '', $className);
 
                 // strip the App\, change \ to / and add .php
                 return $tmpDir.'/src/'.str_replace('\\', '/', $shortClassName).'.php';
@@ -152,7 +154,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
                         'is_bundle' => false,
                         'type' => 'annotation',
                         'dir' => '%kernel.root_dir%/src/Entity',
-                        'prefix' => 'Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity',
+                        'prefix' => 'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',
                         'alias' => 'EntityRegeneratorApp',
                     ]
                 ]
@@ -197,7 +199,7 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
                         'is_bundle' => false,
                         'type' => 'xml',
                         'dir' => '%kernel.root_dir%/config/doctrine',
-                        'prefix' => 'Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity',
+                        'prefix' => 'Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity',
                         'alias' => 'EntityRegeneratorApp',
                     ]
                 ]
@@ -207,13 +209,13 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
 
     public function getRootDir()
     {
-        return __DIR__.'/../tmp/current_project';
+        return __DIR__.'/../tmp/current_project_xml';
     }
 }
 
 class AllButTraitsIterator extends \RecursiveFilterIterator
 {
     public function accept() {
-        return !in_array($this->current()->getFilename(), ['TeamTrait.php', 'TimestampableTrait.php']);
+        return !in_array($this->current()->getFilename(), []);
     }
 }
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/BaseClient.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/BaseClient.php
index 640514442..d2286f766 100644
--- a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/BaseClient.php
+++ b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/BaseClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Client.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Client.php
index c3c4080b4..951b3bfd7 100644
--- a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Client.php
+++ b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Embed.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Embed.php
index acb5aa85f..ea4aa8043 100644
--- a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Embed.php
+++ b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Embed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Tag.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Tag.php
index 292d3cba9..63552be48 100644
--- a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Tag.php
+++ b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/Tag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/User.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/User.php
index 91e5b5680..0bf2e5e1d 100644
--- a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/User.php
+++ b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserAvatar.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserAvatar.php
index 2784d098e..482b2c9fe 100644
--- a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserAvatar.php
+++ b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserProfile.php b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserProfile.php
index 4440f3b49..6b1143490 100644
--- a/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserProfile.php
+++ b/tests/Doctrine/fixtures/expected_no_overwrite/src/Entity/UserProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/BaseClient.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/BaseClient.php
index 09695034e..3743d5c15 100644
--- a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/BaseClient.php
+++ b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/BaseClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Client.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Client.php
index c3c4080b4..951b3bfd7 100644
--- a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Client.php
+++ b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Embed.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Embed.php
index acb5aa85f..ea4aa8043 100644
--- a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Embed.php
+++ b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Embed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Tag.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Tag.php
index 292d3cba9..63552be48 100644
--- a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Tag.php
+++ b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/Tag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/User.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/User.php
index ac943e7dc..13a5f4ecc 100644
--- a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/User.php
+++ b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserAvatar.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserAvatar.php
index 2784d098e..482b2c9fe 100644
--- a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserAvatar.php
+++ b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserProfile.php b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserProfile.php
index 4440f3b49..6b1143490 100644
--- a/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserProfile.php
+++ b/tests/Doctrine/fixtures/expected_overwrite/src/Entity/UserProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Entity/UserAvatar.php b/tests/Doctrine/fixtures/expected_xml/src/Entity/UserAvatar.php
index c7acf4ea9..db2d8d9f9 100644
--- a/tests/Doctrine/fixtures/expected_xml/src/Entity/UserAvatar.php
+++ b/tests/Doctrine/fixtures/expected_xml/src/Entity/UserAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity;
 
 class UserAvatar
 {
@@ -13,12 +13,12 @@ public function getId(): ?int
         return $this->id;
     }
 
-    public function getUser(): ?User
+    public function getUser(): ?UserXml
     {
         return $this->user;
     }
 
-    public function setUser(?User $user): self
+    public function setUser(?UserXml $user): self
     {
         $this->user = $user;
 
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Entity/User.php b/tests/Doctrine/fixtures/expected_xml/src/Entity/UserXml.php
similarity index 93%
rename from tests/Doctrine/fixtures/expected_xml/src/Entity/User.php
rename to tests/Doctrine/fixtures/expected_xml/src/Entity/UserXml.php
index e8cfaf008..b5df783be 100644
--- a/tests/Doctrine/fixtures/expected_xml/src/Entity/User.php
+++ b/tests/Doctrine/fixtures/expected_xml/src/Entity/UserXml.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 
-class User
+class UserXml
 {
     private $id;
 
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Entity/XOther.php b/tests/Doctrine/fixtures/expected_xml/src/Entity/XOther.php
index 9c4607bb3..92605f403 100644
--- a/tests/Doctrine/fixtures/expected_xml/src/Entity/XOther.php
+++ b/tests/Doctrine/fixtures/expected_xml/src/Entity/XOther.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity;
 
 class XOther
 {
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Repository/UserRepository.php b/tests/Doctrine/fixtures/expected_xml/src/Repository/UserRepository.php
index 8853b86db..1e7ea450c 100644
--- a/tests/Doctrine/fixtures/expected_xml/src/Repository/UserRepository.php
+++ b/tests/Doctrine/fixtures/expected_xml/src/Repository/UserRepository.php
@@ -1,26 +1,26 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Repository;
 
-use Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\User;
+use Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\UserXml;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 
 /**
- * @method User|null find($id, $lockMode = null, $lockVersion = null)
- * @method User|null findOneBy(array $criteria, array $orderBy = null)
- * @method User[]    findAll()
- * @method User[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ * @method UserXml|null find($id, $lockMode = null, $lockVersion = null)
+ * @method UserXml|null findOneBy(array $criteria, array $orderBy = null)
+ * @method UserXml[]    findAll()
+ * @method UserXml[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
 class UserRepository extends ServiceEntityRepository
 {
     public function __construct(RegistryInterface $registry)
     {
-        parent::__construct($registry, User::class);
+        parent::__construct($registry, UserXml::class);
     }
 
     // /**
-    //  * @return User[] Returns an array of User objects
+    //  * @return UserXml[] Returns an array of UserXml objects
     //  */
     /*
     public function findByExampleField($value)
@@ -37,7 +37,7 @@ public function findByExampleField($value)
     */
 
     /*
-    public function findOneBySomeField($value): ?User
+    public function findOneBySomeField($value): ?UserXml
     {
         return $this->createQueryBuilder('u')
             ->andWhere('u.exampleField = :val')
diff --git a/tests/Doctrine/fixtures/expected_xml/src/Repository/XOtherRepository.php b/tests/Doctrine/fixtures/expected_xml/src/Repository/XOtherRepository.php
index fc4bc05b1..0db82d653 100644
--- a/tests/Doctrine/fixtures/expected_xml/src/Repository/XOtherRepository.php
+++ b/tests/Doctrine/fixtures/expected_xml/src/Repository/XOtherRepository.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Repository;
 
-use Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\XOther;
+use Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\XOther;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Symfony\Bridge\Doctrine\RegistryInterface;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/BaseClient.php b/tests/Doctrine/fixtures/source_project/src/Entity/BaseClient.php
index 6c4c2fea6..704cab09e 100644
--- a/tests/Doctrine/fixtures/source_project/src/Entity/BaseClient.php
+++ b/tests/Doctrine/fixtures/source_project/src/Entity/BaseClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/Client.php b/tests/Doctrine/fixtures/source_project/src/Entity/Client.php
index 0370c0f94..8fb37f536 100644
--- a/tests/Doctrine/fixtures/source_project/src/Entity/Client.php
+++ b/tests/Doctrine/fixtures/source_project/src/Entity/Client.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/Embed.php b/tests/Doctrine/fixtures/source_project/src/Entity/Embed.php
index d873c4aea..8d38dd9ef 100644
--- a/tests/Doctrine/fixtures/source_project/src/Entity/Embed.php
+++ b/tests/Doctrine/fixtures/source_project/src/Entity/Embed.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/Tag.php b/tests/Doctrine/fixtures/source_project/src/Entity/Tag.php
index 292d3cba9..63552be48 100644
--- a/tests/Doctrine/fixtures/source_project/src/Entity/Tag.php
+++ b/tests/Doctrine/fixtures/source_project/src/Entity/Tag.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/TeamTrait.php b/tests/Doctrine/fixtures/source_project/src/Entity/TeamTrait.php
index 6d4708229..09836c4a8 100644
--- a/tests/Doctrine/fixtures/source_project/src/Entity/TeamTrait.php
+++ b/tests/Doctrine/fixtures/source_project/src/Entity/TeamTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/TimestampableTrait.php b/tests/Doctrine/fixtures/source_project/src/Entity/TimestampableTrait.php
index ee888b216..265d43001 100644
--- a/tests/Doctrine/fixtures/source_project/src/Entity/TimestampableTrait.php
+++ b/tests/Doctrine/fixtures/source_project/src/Entity/TimestampableTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/User.php b/tests/Doctrine/fixtures/source_project/src/Entity/User.php
index d7b719abf..c836a09ae 100644
--- a/tests/Doctrine/fixtures/source_project/src/Entity/User.php
+++ b/tests/Doctrine/fixtures/source_project/src/Entity/User.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/UserAvatar.php b/tests/Doctrine/fixtures/source_project/src/Entity/UserAvatar.php
index d4cd0a196..13ea208de 100644
--- a/tests/Doctrine/fixtures/source_project/src/Entity/UserAvatar.php
+++ b/tests/Doctrine/fixtures/source_project/src/Entity/UserAvatar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/source_project/src/Entity/UserProfile.php b/tests/Doctrine/fixtures/source_project/src/Entity/UserProfile.php
index 3a1dbcec3..7d0251a36 100644
--- a/tests/Doctrine/fixtures/source_project/src/Entity/UserProfile.php
+++ b/tests/Doctrine/fixtures/source_project/src/Entity/UserProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\Doctrine\fixtures\source_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserAvatar.orm.xml b/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserAvatar.orm.xml
index 280cd833d..53dbdd651 100644
--- a/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserAvatar.orm.xml
+++ b/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserAvatar.orm.xml
@@ -3,11 +3,11 @@
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
         http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\UserAvatar">
+    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\UserAvatar">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
-        <many-to-one field="user" target-entity="User" inversed-by="avatars">
+        <many-to-one field="user" target-entity="UserXml" inversed-by="avatars">
             <cascade>
                 <cascade-persist/>
                 <cascade-remove/>
diff --git a/tests/Doctrine/fixtures/xml_source_project/config/doctrine/User.orm.xml b/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserXml.orm.xml
similarity index 84%
rename from tests/Doctrine/fixtures/xml_source_project/config/doctrine/User.orm.xml
rename to tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserXml.orm.xml
index da4715f6a..ae9ef5bd8 100644
--- a/tests/Doctrine/fixtures/xml_source_project/config/doctrine/User.orm.xml
+++ b/tests/Doctrine/fixtures/xml_source_project/config/doctrine/UserXml.orm.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
         http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\User" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository\UserRepository">
+    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\UserXml" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Repository\UserRepository">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/tests/Doctrine/fixtures/xml_source_project/config/doctrine/XOther.orm.xml b/tests/Doctrine/fixtures/xml_source_project/config/doctrine/XOther.orm.xml
index ac6753aff..8ebbbba0b 100644
--- a/tests/Doctrine/fixtures/xml_source_project/config/doctrine/XOther.orm.xml
+++ b/tests/Doctrine/fixtures/xml_source_project/config/doctrine/XOther.orm.xml
@@ -3,7 +3,7 @@
     xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
         http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity\XOther" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Repository\XOtherRepository">
+    <entity name="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity\XOther" repository-class="Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Repository\XOtherRepository">
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
diff --git a/tests/Doctrine/fixtures/xml_source_project/src/Entity/User.php b/tests/Doctrine/fixtures/xml_source_project/src/Entity/UserXml.php
similarity index 57%
rename from tests/Doctrine/fixtures/xml_source_project/src/Entity/User.php
rename to tests/Doctrine/fixtures/xml_source_project/src/Entity/UserXml.php
index cb8d12979..8aee6702f 100644
--- a/tests/Doctrine/fixtures/xml_source_project/src/Entity/User.php
+++ b/tests/Doctrine/fixtures/xml_source_project/src/Entity/UserXml.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project\src\Entity;
+namespace Symfony\Bundle\MakerBundle\Tests\tmp\current_project_xml\src\Entity;
 
-class User
+class UserXml
 {
     private $id;