diff --git a/src/Action/RetrieveAutocompleteItemsAction.php b/src/Action/RetrieveAutocompleteItemsAction.php
index e8897d08f7..e6c64332d4 100644
--- a/src/Action/RetrieveAutocompleteItemsAction.php
+++ b/src/Action/RetrieveAutocompleteItemsAction.php
@@ -190,7 +190,7 @@ private function retrieveFilterFieldDescription(
             throw new \RuntimeException(sprintf('The field "%s" does not exist.', $field));
         }
 
-        if (null === $fieldDescription->getTargetEntity()) {
+        if (null === $fieldDescription->getTargetModel()) {
             throw new \RuntimeException(sprintf('No associated entity with field "%s".', $field));
         }
 
@@ -212,7 +212,7 @@ private function retrieveFormFieldDescription(
             throw new \RuntimeException(sprintf('The field "%s" does not exist.', $field));
         }
 
-        if (null === $fieldDescription->getTargetEntity()) {
+        if (null === $fieldDescription->getTargetModel()) {
             throw new \RuntimeException(sprintf('No associated entity with field "%s".', $field));
         }
 
diff --git a/src/Action/SetObjectFieldValueAction.php b/src/Action/SetObjectFieldValueAction.php
index bc9240a3cc..71c5e9bf8e 100644
--- a/src/Action/SetObjectFieldValueAction.php
+++ b/src/Action/SetObjectFieldValueAction.php
@@ -132,7 +132,7 @@ public function __invoke(Request $request): JsonResponse
         if ('' !== $value
             && 'choice' === $fieldDescription->getType()
             && null !== $fieldDescription->getOption('class')
-            && $fieldDescription->getOption('class') === $fieldDescription->getTargetEntity()
+            && $fieldDescription->getOption('class') === $fieldDescription->getTargetModel()
         ) {
             $value = $admin->getModelManager()->find($fieldDescription->getOption('class'), $value);
 
diff --git a/src/Admin/AbstractAdmin.php b/src/Admin/AbstractAdmin.php
index aadd6f2f35..5bc4ca5064 100644
--- a/src/Admin/AbstractAdmin.php
+++ b/src/Admin/AbstractAdmin.php
@@ -1430,11 +1430,11 @@ public function attachAdminClass(FieldDescriptionInterface $fieldDescription)
 
             $admin = $pool->getAdminByAdminCode($adminCode);
         } else {
-            if (!$pool->hasAdminByClass($fieldDescription->getTargetEntity())) {
+            if (!$pool->hasAdminByClass($fieldDescription->getTargetModel())) {
                 return;
             }
 
-            $admin = $pool->getAdminByClass($fieldDescription->getTargetEntity());
+            $admin = $pool->getAdminByClass($fieldDescription->getTargetModel());
         }
 
         if ($this->hasRequest()) {
diff --git a/tests/Action/RetrieveAutocompleteItemsActionTest.php b/tests/Action/RetrieveAutocompleteItemsActionTest.php
index 2e611a352e..7a11e16138 100644
--- a/tests/Action/RetrieveAutocompleteItemsActionTest.php
+++ b/tests/Action/RetrieveAutocompleteItemsActionTest.php
@@ -94,7 +94,7 @@ public function testRetrieveAutocompleteItemsActionDisabledFormelememt(): void
         $this->admin->getFormFieldDescriptions()->willReturn(null);
         $this->admin->getFormFieldDescription('barField')->willReturn($fieldDescription->reveal());
 
-        $fieldDescription->getTargetEntity()->willReturn(Foo::class);
+        $fieldDescription->getTargetModel()->willReturn(Foo::class);
         $fieldDescription->getName()->willReturn('barField');
 
         ($this->action)($request);
@@ -120,7 +120,7 @@ public function testRetrieveAutocompleteItemsTooShortSearchString(): void
         $this->admin->getFormFieldDescription('barField')->willReturn($fieldDescription->reveal());
         $this->admin->getFormFieldDescriptions()->willReturn(null);
         $targetAdmin->checkAccess('list')->willReturn(null);
-        $fieldDescription->getTargetEntity()->willReturn(Foo::class);
+        $fieldDescription->getTargetModel()->willReturn(Foo::class);
         $fieldDescription->getName()->willReturn('barField');
         $fieldDescription->getAssociationAdmin()->willReturn($targetAdmin->reveal());
 
@@ -241,7 +241,7 @@ private function configureAutocompleteItemsDatagrid(): ObjectProphecy
         $datagrid->getPager()->willReturn($pager->reveal());
         $pager->getResults()->willReturn([$model]);
         $pager->isLastPage()->willReturn(true);
-        $fieldDescription->getTargetEntity()->willReturn(Foo::class);
+        $fieldDescription->getTargetModel()->willReturn(Foo::class);
         $fieldDescription->getName()->willReturn('barField');
         $fieldDescription->getAssociationAdmin()->willReturn($targetAdmin->reveal());
 
diff --git a/tests/Action/SetObjectFieldValueActionTest.php b/tests/Action/SetObjectFieldValueActionTest.php
index e8ca3af1f5..75fe058dec 100644
--- a/tests/Action/SetObjectFieldValueActionTest.php
+++ b/tests/Action/SetObjectFieldValueActionTest.php
@@ -260,7 +260,7 @@ public function testSetObjectFieldValueActionOnARelationField(): void
         $fieldDescription->getType()->willReturn('choice');
         $fieldDescription->getOption('editable')->willReturn(true);
         $fieldDescription->getOption('class')->willReturn(Bar::class);
-        $fieldDescription->getTargetEntity()->willReturn(Bar::class);
+        $fieldDescription->getTargetModel()->willReturn(Bar::class);
         $fieldDescription->getAdmin()->willReturn($this->admin->reveal());
         $fieldDescription->getTemplate()->willReturn('field_template');
         $fieldDescription->getValue(Argument::cetera())->willReturn('some value');
diff --git a/tests/App/Admin/FieldDescription.php b/tests/App/Admin/FieldDescription.php
index fc1d9a9df0..dcfea19d04 100644
--- a/tests/App/Admin/FieldDescription.php
+++ b/tests/App/Admin/FieldDescription.php
@@ -26,6 +26,11 @@ public function getTargetEntity()
         return null;
     }
 
+    public function getTargetModel()
+    {
+        return null;
+    }
+
     public function setFieldMapping($fieldMapping)
     {
     }
diff --git a/tests/Controller/HelperControllerTest.php b/tests/Controller/HelperControllerTest.php
index 13f5b57df9..d00c502188 100644
--- a/tests/Controller/HelperControllerTest.php
+++ b/tests/Controller/HelperControllerTest.php
@@ -270,7 +270,7 @@ public function testSetObjectFieldValueActionOnARelationField(): void
         $fieldDescription->getType()->willReturn('choice');
         $fieldDescription->getOption('editable')->willReturn(true);
         $fieldDescription->getOption('class')->willReturn(AdminControllerHelper_Bar::class);
-        $fieldDescription->getTargetEntity()->willReturn(AdminControllerHelper_Bar::class);
+        $fieldDescription->getTargetModel()->willReturn(AdminControllerHelper_Bar::class);
         $fieldDescription->getAdmin()->willReturn($this->admin->reveal());
         $fieldDescription->getTemplate()->willReturn('field_template');
         $fieldDescription->getValue(Argument::cetera())->willReturn('some value');
@@ -426,7 +426,7 @@ public function testRetrieveAutocompleteItemsActionDisabledFormelememt(): void
         $this->admin->getFormFieldDescriptions()->willReturn(null);
         $this->admin->getFormFieldDescription('barField')->willReturn($fieldDescription->reveal());
 
-        $fieldDescription->getTargetEntity()->willReturn(Foo::class);
+        $fieldDescription->getTargetModel()->willReturn(Foo::class);
         $fieldDescription->getName()->willReturn('barField');
 
         $this->controller->retrieveAutocompleteItemsAction($request);
@@ -452,7 +452,7 @@ public function testRetrieveAutocompleteItemsTooShortSearchString(): void
         $this->admin->getFormFieldDescription('barField')->willReturn($fieldDescription->reveal());
         $this->admin->getFormFieldDescriptions()->willReturn(null);
         $targetAdmin->checkAccess('list')->willReturn(null);
-        $fieldDescription->getTargetEntity()->willReturn(Foo::class);
+        $fieldDescription->getTargetModel()->willReturn(Foo::class);
         $fieldDescription->getName()->willReturn('barField');
         $fieldDescription->getAssociationAdmin()->willReturn($targetAdmin->reveal());
 
@@ -573,7 +573,7 @@ private function configureAutocompleteItemsDatagrid(): ObjectProphecy
         $datagrid->getPager()->willReturn($pager->reveal());
         $pager->getResults()->willReturn([$model]);
         $pager->isLastPage()->willReturn(true);
-        $fieldDescription->getTargetEntity()->willReturn(Foo::class);
+        $fieldDescription->getTargetModel()->willReturn(Foo::class);
         $fieldDescription->getName()->willReturn('barField');
         $fieldDescription->getAssociationAdmin()->willReturn($targetAdmin->reveal());
 
diff --git a/tests/Fixtures/Admin/FieldDescription.php b/tests/Fixtures/Admin/FieldDescription.php
index 2f8cb2d01f..434d4fac6e 100644
--- a/tests/Fixtures/Admin/FieldDescription.php
+++ b/tests/Fixtures/Admin/FieldDescription.php
@@ -27,6 +27,11 @@ public function getTargetEntity(): void
         // TODO: Implement getTargetEntity() method.
     }
 
+    public function getTargetModel(): ?string
+    {
+        throw new \BadMethodCallException(sprintf('Implement %s() method.', __METHOD__));
+    }
+
     public function setFieldMapping($fieldMapping): void
     {
         // TODO: Implement setFieldMapping() method.