diff --git a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
index a20157ce0..7454ba6cf 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
@@ -119,7 +119,7 @@ class CreateFieldsOnGroupCommand extends Command
         $em = $this->entityManager;
 
         $customFieldsGroups = $em
-            ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findAll();
 
         if (count($customFieldsGroups) === 0) {
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
index 4ec9a8c67..7fae79016 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
@@ -138,7 +138,7 @@ class CustomFieldController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillCustomFieldsBundle:CustomField')->find($id);
+        $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomField::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find CustomField entity.');
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
index 5398c5f38..68d9fb8ec 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
@@ -92,7 +92,7 @@ class CustomFieldsGroupController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id);
+        $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.');
@@ -113,7 +113,7 @@ class CustomFieldsGroupController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $cfGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->findAll();
+        $cfGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->findAll();
         $defaultGroups = $this->getDefaultGroupsId();
 
         $makeDefaultFormViews = [];
@@ -143,7 +143,7 @@ class CustomFieldsGroupController extends AbstractController
 
         $em = $this->getDoctrine()->getManager();
 
-        $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->findOneById($cFGroupId);
+        $cFGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->findOneById($cFGroupId);
 
         if (!$cFGroup) {
             throw $this
@@ -151,7 +151,7 @@ class CustomFieldsGroupController extends AbstractController
                         . "id {$cFGroupId}");
         }
 
-        $cFDefaultGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsDefaultGroup')
+        $cFDefaultGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class)
             ->findOneByEntity($cFGroup->getEntity());
 
         if ($cFDefaultGroup) {
@@ -204,7 +204,7 @@ class CustomFieldsGroupController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id);
+        $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find CustomFieldsGroups entity.');
@@ -248,7 +248,7 @@ class CustomFieldsGroupController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id);
+        $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.');
@@ -272,7 +272,7 @@ class CustomFieldsGroupController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $entity = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($id);
+        $entity = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find CustomFieldsGroup entity.');
diff --git a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
index 250418581..f8095018a 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
@@ -19,6 +19,9 @@ use function array_key_exists;
 
 use const JSON_THROW_ON_ERROR;
 
+/**
+ * Not in use ? Deprecated ?
+ */
 class JsonCustomFieldToArrayTransformer implements DataTransformerInterface
 {
     private array $customField;
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 22d3d9388..bd53cd8b3 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -156,7 +156,7 @@ final class PersonController extends AbstractController
     {
         $cFGroup = null;
 
-        $cFDefaultGroup = $this->em->getRepository('ChillCustomFieldsBundle:CustomFieldsDefaultGroup')
+        $cFDefaultGroup = $this->em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup::class)
             ->findOneByEntity('Chill\\PersonBundle\\Entity\\Person');
 
         if ($cFDefaultGroup) {
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
index d3763a905..9e2f326fb 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
@@ -133,7 +133,7 @@ class PersonListWidget implements WidgetInterface
         if (isset($config['custom_fields'])) {
             if (count($config['custom_fields']) > 0) {
                 $cfs = $this->entityManager
-                    ->getRepository('ChillCustomFieldsBundle:CustomField')
+                    ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomField::class)
                     ->findBy(['slug' => $config['custom_fields']]);
                 // store the custom fields in a array
                 foreach ($cfs as $cf) {
diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php
index 7f19b3434..e322fb791 100644
--- a/src/Bundle/ChillReportBundle/Controller/ReportController.php
+++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php
@@ -75,7 +75,7 @@ class ReportController extends AbstractController
         $em = $this->getDoctrine()->getManager();
 
         $entity = new Report();
-        $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+        $cFGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->find($cf_group_id);
 
         $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)
@@ -186,7 +186,7 @@ class ReportController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
 
-        $cFGroup = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')->find($cf_group_id);
+        $cFGroup = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)->find($cf_group_id);
         $reports = $em->getRepository('ChillReportBundle:Report')->findByCFGroup($cFGroup);
 
         $response = $this->render('ChillReportBundle:Report:export.csv.twig', [
@@ -271,7 +271,7 @@ class ReportController extends AbstractController
 
         $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($person_id);
         $cFGroup = $em
-            ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->find($cf_group_id);
 
         if (null === $person) {
@@ -343,7 +343,7 @@ class ReportController extends AbstractController
             );
         }
 
-        $cFGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+        $cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findByEntity('Chill\ReportBundle\Entity\Report');
 
         if (count($cFGroups) === 1) {
@@ -402,7 +402,7 @@ class ReportController extends AbstractController
 
         $em = $this->getDoctrine()->getManager();
 
-        $cFGroups = $em->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+        $cFGroups = $em->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findByEntity('Chill\ReportBundle\Entity\Report');
 
         if (count($cFGroups) === 1) {
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
index f80645bc5..f25b639be 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerNextTest.php
@@ -63,7 +63,7 @@ final class ReportControllerNextTest extends WebTestCase
         // get custom fields group from fixture
         $customFieldsGroups = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findBy(['entity' => 'Chill\ReportBundle\Entity\Report']);
         //filter customFieldsGroup to get only "situation de logement"
         $filteredCustomFieldsGroupHouse = array_filter(
diff --git a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
index 70516c5be..cc93214f3 100644
--- a/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php
@@ -81,7 +81,7 @@ final class ReportControllerTest extends WebTestCase
 
         $customFieldsGroups = self::$kernel->getContainer()
             ->get('doctrine.orm.entity_manager')
-            ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findBy(['entity' => 'Chill\ReportBundle\Entity\Report']);
         //filter customFieldsGroup to get only "situation de logement"
         $filteredCustomFieldsGroupHouse = array_filter(
diff --git a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
index 45f009a4f..4fcac191b 100644
--- a/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
+++ b/src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php
@@ -180,7 +180,7 @@ final class TimelineProviderTest extends WebTestCase
     private function getHousingCustomFieldsGroup()
     {
         $groups = self::$em
-            ->getRepository('ChillCustomFieldsBundle:CustomFieldsGroup')
+            ->getRepository(\Chill\CustomFieldsBundle\Entity\CustomFieldsGroup::class)
             ->findAll();
 
         foreach ($groups as $group) {