diff --git a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
index 4d621d56e..47ecb66dc 100644
--- a/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
+++ b/src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php
@@ -106,7 +106,7 @@ class ActivityRepository extends ServiceEntityRepository implements AssociatedEn
      * @throws NonUniqueResultException
      * @throws NoResultException
      */
-    public function findAssociatedEntityToStoredObject(StoredObject $storedObject): ?object
+    public function findAssociatedEntityToStoredObject(StoredObject $storedObject): ?Activity
     {
         $qb = $this->createQueryBuilder('a');
         $query = $qb
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/ActivityStoredObjectVoter.php b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStoredObjectVoter.php
similarity index 94%
rename from src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/ActivityStoredObjectVoter.php
rename to src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStoredObjectVoter.php
index a36535005..01ec68bd9 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/ActivityStoredObjectVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStoredObjectVoter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace src\Bundle\ChillDocStoreBundle\Security\Authorization\StoredObjectVoters;
+namespace Chill\ActivityBundle\Security\Authorization;
 
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Repository\ActivityDocumentACLAwareRepository;
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingCourseStoredObjectVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingCourseDocumentStoredObjectVoter.php
similarity index 90%
rename from src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingCourseStoredObjectVoter.php
rename to src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingCourseDocumentStoredObjectVoter.php
index a41ea3067..86e7bd9de 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingCourseStoredObjectVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingCourseDocumentStoredObjectVoter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ChillDocStoreBundle\Security\Authorization\StoredObjectVoters;
+namespace Chill\DocStoreBundle\Security\Authorization\StoredObjectVoters;
 
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
 use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
@@ -11,7 +11,7 @@ use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoters\AbstractStore
 use Chill\DocStoreBundle\Service\WorkflowDocumentService;
 use Symfony\Component\Security\Core\Security;
 
-final class AccompanyingCourseStoredObjectVoter extends AbstractStoredObjectVoter
+final class AccompanyingCourseDocumentStoredObjectVoter extends AbstractStoredObjectVoter
 {
     public function __construct(
         private readonly AccompanyingCourseDocumentRepository $repository,
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingPeriodWorkEvaluationStoredObjectVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingPeriodWorkEvaluationStoredObjectVoter.php
index 72e422776..d6ae5cdbf 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingPeriodWorkEvaluationStoredObjectVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/AccompanyingPeriodWorkEvaluationStoredObjectVoter.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace src\Bundle\ChillDocStoreBundle\Security\Authorization\StoredObjectVoters;
+namespace Chill\DocStoreBundle\Security\Authorization\StoredObjectVoters;
 
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
-use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoters\AbstractStoredObjectVoter;
 use Chill\DocStoreBundle\Service\WorkflowDocumentService;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/PersonStoredObjectVoter.php b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/PersonDocumentStoredObjectVoter.php
similarity index 90%
rename from src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/PersonStoredObjectVoter.php
rename to src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/PersonDocumentStoredObjectVoter.php
index 6c3b0b807..a40d08849 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/PersonStoredObjectVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/PersonDocumentStoredObjectVoter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace src\Bundle\ChillDocStoreBundle\Security\Authorization\StoredObjectVoters;
+namespace Chill\DocStoreBundle\Security\Authorization\StoredObjectVoters;
 
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
@@ -11,7 +11,7 @@ use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoters\AbstractStore
 use Chill\DocStoreBundle\Service\WorkflowDocumentService;
 use Symfony\Component\Security\Core\Security;
 
-class PersonStoredObjectVoter extends AbstractStoredObjectVoter
+class PersonDocumentStoredObjectVoter extends AbstractStoredObjectVoter
 {
     public function __construct(
         private readonly PersonDocumentRepository $repository,
diff --git a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/EventStoredObjectVoter.php b/src/Bundle/ChillEventBundle/Security/Authorization/EventStoredObjectVoter.php
similarity index 94%
rename from src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/EventStoredObjectVoter.php
rename to src/Bundle/ChillEventBundle/Security/Authorization/EventStoredObjectVoter.php
index 218ce1980..9db6177c8 100644
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoters/EventStoredObjectVoter.php
+++ b/src/Bundle/ChillEventBundle/Security/Authorization/EventStoredObjectVoter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace src\Bundle\ChillDocStoreBundle\Security\Authorization\StoredObjectVoters;
+namespace Chill\EventBundle\Security\Authorization;
 
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;