diff --git a/Resources/config/doctrine_orm.php b/Resources/config/doctrine_orm.php
index 8032147..7605d45 100644
--- a/Resources/config/doctrine_orm.php
+++ b/Resources/config/doctrine_orm.php
@@ -1,7 +1,7 @@
 <?php
 
 use Admingenerator\GeneratorBundle\Generator\DoctrineGenerator;
-use Admingenerator\GeneratorBundle\Guesser\DoctrineFieldGuesser;
+use Admingenerator\GeneratorBundle\Guesser\DoctrineORMFieldGuesser;
 use Admingenerator\GeneratorBundle\QueryFilter\DoctrineQueryFilter;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\param;
@@ -10,7 +10,7 @@
 return static function (ContainerConfigurator $container): void {
     $container->parameters()
         ->set('admingenerator.doctrine.class', DoctrineGenerator::class)
-        ->set('admingenerator.fieldguesser.doctrine.class', DoctrineFieldGuesser::class)
+        ->set('admingenerator.fieldguesser.doctrine.class', DoctrineORMFieldGuesser::class)
         ->set('admingenerator.queryfilter.doctrine.class', DoctrineQueryFilter::class);
 
     $services = $container->services();
diff --git a/Tests/Builder/BaseBuilderTest.php b/Tests/Builder/BaseBuilderTest.php
index 9176308..24fb951 100755
--- a/Tests/Builder/BaseBuilderTest.php
+++ b/Tests/Builder/BaseBuilderTest.php
@@ -97,7 +97,7 @@ protected function initBuilder(): BaseBuilder
         $generator = $this->getMockBuilder('Admingenerator\GeneratorBundle\Builder\Generator')
                           ->disableOriginalConstructor()
                           ->getMock();
-        $generator->method('getTempDir')->willReturn('/tmp');
+        $generator->method('getTempDir')->willReturn('/tmp/Admingenerator');
 
         $builder->setGenerator($generator);
         $builder->setMustOverwriteIfExists(true);