diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index e0869b77f..808293c75 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -91,10 +91,10 @@ final class ActivityController extends AbstractController
         }
 
         if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/confirm_deleteAccompanyingCourse.html.twig';
             $accompanyingPeriod = $activity->getAccompanyingPeriod();
         } else {
-            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
+            $view = '@ChillActivity/Activity/confirm_deletePerson.html.twig';
         }
 
         // TODO
@@ -164,10 +164,10 @@ final class ActivityController extends AbstractController
         $person = $entity->getPerson();
 
         if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/editAccompanyingCourse.html.twig';
             $accompanyingPeriod = $entity->getAccompanyingPeriod();
         } else {
-            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
+            $view = '@ChillActivity/Activity/editPerson.html.twig';
         }
         // TODO
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
@@ -283,7 +283,7 @@ final class ActivityController extends AbstractController
             ]);
             $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-            $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
+            $view = '@ChillActivity/Activity/listPerson.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
 
@@ -299,7 +299,7 @@ final class ActivityController extends AbstractController
                     $filterArgs
                 );
 
-            $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/listAccompanyingCourse.html.twig';
         } else {
             throw new \LogicException("Unsupported");
         }
@@ -358,9 +358,9 @@ final class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/newAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
+            $view = '@ChillActivity/Activity/newPerson.html.twig';
         }
 
         $activityType_id = $request->get('activityType_id', 0);
@@ -538,9 +538,9 @@ final class ActivityController extends AbstractController
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:selectTypeAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/selectTypeAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:selectTypePerson.html.twig';
+            $view = '@ChillActivity/Activity/selectTypePerson.html.twig';
         }
 
         $data = [];
@@ -587,9 +587,9 @@ final class ActivityController extends AbstractController
         $person = $entity->getPerson();
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
+            $view = '@ChillActivity/Activity/showAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
+            $view = '@ChillActivity/Activity/showPerson.html.twig';
         } else {
             throw new RuntimeException('the activity should be linked with a period or person');
         }
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
index 3094b8e26..b1050d3b8 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
@@ -45,7 +45,7 @@ class ActivityReasonController extends AbstractController
             return $this->redirectToRoute('chill_activity_activityreason', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -66,7 +66,7 @@ class ActivityReasonController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -81,7 +81,7 @@ class ActivityReasonController extends AbstractController
 
         $entities = $this->activityReasonRepository->findAll();
 
-        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/index.html.twig', [
             'entities' => $entities,
         ]);
     }
@@ -94,7 +94,7 @@ class ActivityReasonController extends AbstractController
         $entity = new ActivityReason();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -113,7 +113,7 @@ class ActivityReasonController extends AbstractController
             throw $this->createNotFoundException('Unable to find ActivityReason entity.');
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/show.html.twig', [
             'entity' => $entity,
         ]);
     }
@@ -140,7 +140,7 @@ class ActivityReasonController extends AbstractController
             return $this->redirectToRoute('chill_activity_activityreason', ['id' => $id]);
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+        return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
diff --git a/src/Bundle/ChillActivityBundle/Controller/AdminController.php b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
index 4f96bb36f..64d03cd2b 100644
--- a/src/Bundle/ChillActivityBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/AdminController.php
@@ -20,7 +20,7 @@ class AdminController extends AbstractController
 {
     public function indexActivityAction()
     {
-        return $this->render('ChillActivityBundle:Admin:layout_activity.html.twig');
+        return $this->render('@ChillActivity/Admin/layout_activity.html.twig');
     }
 
     public function redirectToAdminIndexAction()
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index 8d1aba2b3..b3382c3de 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -75,7 +75,7 @@
             {% endif %}
         </div>
 
-        {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+        {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
             'context': context,
             'render': 'wrap-list',
             'entity': activity,
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
index d0359e223..3cf476bbb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
@@ -8,7 +8,7 @@
 <div class="activity-edit">
 
     <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+    {% include '@ChillActivity/Activity/edit.html.twig' %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
index 91b3867c1..73eec5f62 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
@@ -24,7 +24,7 @@
 <div class="activity-edit">
 
     <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
+    {% include '@ChillActivity/Activity/edit.html.twig' %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
index dd78c9396..fde256af0 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -91,7 +91,7 @@
 
         <div class="flex-table activity-list">
             {% for activity in activities %}
-                {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
+                {% include '@ChillActivity/Activity/_list_item.html.twig' with {
                     'context': context,
                     'recordAction': _self.recordAction(activity, context, person_id, accompanying_course_id)
                 } %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
index bdf55d86f..e2710ea43 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
@@ -31,7 +31,7 @@
 
     <h1>{{ 'Activity list' |trans }}</h1>
 
-    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillActivity/Activity/list.html.twig' with {'context': 'accompanyingCourse'} %}
 
     {% if is_granted('CHILL_ACTIVITY_CREATE', accompanyingCourse) %}
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
index 0c1afdac9..5870f124f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -46,7 +46,7 @@
 
     <h1>{{ 'Activity list' |trans }}</h1>
 
-    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
+    {% include '@ChillActivity/Activity/list.html.twig' with {'context': 'person'} %}
 
     {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
index 47a61bd86..0b098dffe 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
@@ -8,7 +8,7 @@
 <div class="activity-new">
 
     <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillActivity/Activity/new.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
index d57fc3412..dd0b91ccb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
@@ -8,7 +8,7 @@
 <div class="activity-new">
 
     <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
+    {% include '@ChillActivity/Activity/new.html.twig' with {'context': 'person'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypeAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypeAccompanyingCourse.html.twig
index 5e73db597..4bc26baea 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypeAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypeAccompanyingCourse.html.twig
@@ -5,5 +5,5 @@
 {% block title 'Activity creation'|trans %}
 
 {% block content %}
-    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
+    {% include '@ChillActivity/Activity/selectType.html.twig' %}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
index f616012e4..c3815f79d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
@@ -5,5 +5,5 @@
 {% block title 'Activity creation'|trans %}
 
 {% block content %}
-    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
+    {% include '@ChillActivity/Activity/selectType.html.twig' %}
 {% endblock %}
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index fca6a7658..d4beb606a 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -88,7 +88,7 @@
 
 <h2 class="chill-blue">{{ 'Concerned groups'|trans }}</h2>
 
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+{% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
     'context': context,
     'render': 'bloc',
     'badge_person': true
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
index 3486f47bc..de471a9ab 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showAccompanyingCourse.html.twig
@@ -18,11 +18,11 @@
     {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
-{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
+{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}
 
 {% block content -%}
 <div class="activity-show">
-    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillActivity/Activity/show.html.twig' with {'context': 'accompanyingCourse'} %}
 </div>
 {% endblock content %}
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
index 721538271..36ba70c7b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
@@ -8,7 +8,7 @@
 {% if activity is not null %}
     <div class="flex-table">
         {% if is_granted('CHILL_ACTIVITY_SEE', activity) %}
-            {% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
+            {% include '@ChillActivity/Activity/_list_item.html.twig' with {
                 'recordAction': _self.recordAction(activity),
                 'context': 'accompanyingCourse',
                 'itemBlocClass': 'bg-chill-llight-gray'
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
index 43a8eb86b..39daee516 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/showPerson.html.twig
@@ -16,11 +16,11 @@
     {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
-{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
+{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}
 
 {% block content -%}
 <div class="activity-show">
-    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
+    {% include '@ChillActivity/Activity/show.html.twig' with {'context': 'person'} %}
 </div>
 {% endblock %}
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
index 435be1958..3979be2f3 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
@@ -1,4 +1,4 @@
-{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
+{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}
 
 <div>
   <h3>{{ activity.date|format_date('long') }}<span class="activity"> / {{ 'Activity'|trans }}</span>{% if 'person' != context %} / {{ activity.person|chill_entity_render_box({'addLink': true}) }}{% endif %}</h3>
diff --git a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
index 4e4fae89f..87fc24b74 100644
--- a/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+++ b/src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
@@ -90,7 +90,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
         $this->checkContext($context);
 
         return [
-            'template' => 'ChillActivityBundle:Timeline:activity_person_context.html.twig',
+            'template' => '@ChillActivity/Timeline/activity_person_context.html.twig',
             'template_data' => [
                 'activity' => $entity,
                 'context' => $context,
diff --git a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
index fdaae0163..694547aa7 100644
--- a/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
+++ b/src/Bundle/ChillBudgetBundle/Controller/ElementController.php
@@ -51,7 +51,7 @@ class ElementController extends AbstractController
             $results = $this->calculator->calculateDefault($elements);
         }
 
-        return $this->render('ChillBudgetBundle:Person:index.html.twig', [
+        return $this->render('@ChillBudget/Person/index.html.twig', [
             'person' => $person,
             'charges' => $charges,
             'resources' => $resources,
@@ -75,7 +75,7 @@ class ElementController extends AbstractController
             $results = $this->calculator->calculateDefault($elements);
         }
 
-        return $this->render('ChillBudgetBundle:Household:index.html.twig', [
+        return $this->render('@ChillBudget/Household/index.html.twig', [
             'household' => $household,
             'charges' => $charges,
             'resources' => $resources,
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
index 62f4e3e96..dde039194 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
@@ -1,4 +1,4 @@
-{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+{% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
 
 <div class="accordion" id="future_{{ entity.id }}">
     <div class="accordion-item">
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
index ad0a12755..72c85c459 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
@@ -1,4 +1,4 @@
-{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+{% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
 
 <div class="accordion" id="past_{{ entity.id }}">
     <div class="accordion-item">
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
index 7a97731da..abfe9a6d5 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
@@ -18,7 +18,7 @@
 
 {% block content %}
 
-{{ include('ChillMainBundle:Util:confirmation_template.html.twig',
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Remove charge'|trans,
         'confirm_question'  : confirm_question,
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
index 1df92b297..738c5e825 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
@@ -1,6 +1,6 @@
 {% extends "@ChillPerson/Household/layout.html.twig" %}
 
-{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
+{% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Budget for household %household%'|trans({ '%household%' : household.id } ) %}
@@ -17,7 +17,7 @@
 {% block content %}
 <h1>{{ title }}</h1>
 
-{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+{% include '@ChillBudget/Budget/_budget.html.twig' with {
     'resources': resources,
     'charges': charges,
     'household': household
@@ -57,7 +57,7 @@
 
                         <h2 class="mt-4">{{ 'Budget for %name%'|trans({'%name%': member.firstName ~ " " ~ member.lastName }) }}</h2>
 
-                        {% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
+                        {% include '@ChillBudget/Budget/_budget.html.twig' with {
                             'resources': member.getBudgetResources,
                             'charges': member.getBudgetCharges,
                             'person': member
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
index aba564206..aaf840f33 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
@@ -1,6 +1,6 @@
 {% extends "@ChillPerson/Person/layout.html.twig" %}
 
-{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_results %}
+{% from '@ChillBudget/Budget/_macros.html.twig' import table_results %}
 
 {% set activeRouteKey = '' %}
 {% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
index 5c2e80e10..afcb54c42 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
@@ -18,7 +18,7 @@
 
 {% block content %}
 
-{{ include('ChillMainBundle:Util:confirmation_template.html.twig',
+{{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Remove resource'|trans,
         'confirm_question'  : confirm_question,
diff --git a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
index 23f39a295..fceddf45a 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/AdminController.php
@@ -23,6 +23,6 @@ class AdminController extends AbstractController
      */
     public function indexAdminAction()
     {
-        return $this->render('ChillCalendarBundle:Admin:index.html.twig');
+        return $this->render('@ChillCalendar/Admin/index.html.twig');
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
index 2c3cde01a..9e87af8ef 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -69,7 +69,7 @@
                     or calendar.users|length > 0 %}
                     <div class="item-row details separator">
                         <div class="item-col">
-                            {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
+                            {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
                                 'context': calendar.context == 'person' ?  'calendar_person' : 'calendar_accompanyingCourse',
                                 'render': 'wrap-list',
                                 'entity': calendar
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
index a167d5c18..728509909 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="calendar-edit">
 
-    {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillCalendar/Calendar/edit.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByPerson.html.twig
index fc5319849..47d29d9bd 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByPerson.html.twig
@@ -7,7 +7,7 @@
 {% block content %}
 <div class="calendar-edit">
 
-    {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'person'} %}
+    {% include '@ChillCalendar/Calendar/edit.html.twig' with {'context': 'person'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
index 0e2170c20..3b3a92847 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
@@ -6,7 +6,7 @@
 <div class="calendar-edit">
 
     <div id="calendar"></div> {# <=== vue component #}
-    {% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'user'} %}
+    {% include '@ChillCalendar/Calendar/edit.html.twig' with {'context': 'user'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
index 43fe6cb04..4c206c706 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
@@ -8,7 +8,7 @@
 <div class="calendar-new">
 
     <div id="calendar"></div> {# <=== vue component #}
-    {% include 'ChillCalendarBundle:Calendar:new.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillCalendar/Calendar/new.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByPerson.html.twig
index b561e6aa7..a8d851656 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByPerson.html.twig
@@ -8,7 +8,7 @@
 <div class="calendar-new">
 
     <div id="calendar"></div> {# <=== vue component #}
-    {% include 'ChillCalendarBundle:Calendar:new.html.twig' with {'context': 'person'} %}
+    {% include '@ChillCalendar/Calendar/new.html.twig' with {'context': 'person'} %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index d48844f67..df1cbb2df 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -15,7 +15,7 @@
 </dl>
 
 <h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': 'calendar_' ~ context, 'render': 'bloc' } %}
+{% include '@ChillActivity/Activity/concernedGroups.html.twig' with {'context': 'calendar_' ~ context, 'render': 'bloc' } %}
 
 
 <h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig
index fa0dd01af..b056ba998 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig
@@ -7,7 +7,7 @@
 {% block content -%}
 <div class="calendar-show">
 
-    {% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include '@ChillCalendar/Calendar/show.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock content %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig
index b8e172030..536ccc03a 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig
@@ -5,7 +5,7 @@
 {% block content -%}
 <div class="calendar-show">
 
-    {% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'user'} %}
+    {% include '@ChillCalendar/Calendar/show.html.twig' with {'context': 'user'} %}
 
 </div>
 {% endblock content %}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig
index 35fa6e319..42d7d7a12 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title 'docgen.Generate a document'|trans %}
 
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
index 794e85462..d424111db 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
@@ -23,7 +23,7 @@ class AdminController extends AbstractController
      */
     public function indexAction()
     {
-        return $this->render('ChillDocStoreBundle:Admin:layout.html.twig');
+        return $this->render('@ChillDocStore/Admin/layout.html.twig');
     }
 
     /**
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
index 69c146fb0..2957a0cc4 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
@@ -68,7 +68,7 @@ class DocumentCategoryController extends AbstractController
                 'idInsideBundle' => $documentCategory->getIdInsideBundle(), ]);
         }
 
-        return $this->render('ChillDocStoreBundle:DocumentCategory:edit.html.twig', [
+        return $this->render('@ChillDocStore/DocumentCategory/edit.html.twig', [
             'document_category' => $documentCategory,
             'form' => $form->createView(),
         ]);
@@ -83,7 +83,7 @@ class DocumentCategoryController extends AbstractController
         $categories = $em->getRepository(DocumentCategory::class)->findAll();
 
         return $this->render(
-            'ChillDocStoreBundle:DocumentCategory:index.html.twig',
+            '@ChillDocStore/DocumentCategory/index.html.twig',
             [
                 'document_categories' => $categories,
             ]
@@ -122,7 +122,7 @@ class DocumentCategoryController extends AbstractController
             return $this->redirectToRoute('document_category_index');
         }
 
-        return $this->render('ChillDocStoreBundle:DocumentCategory:new.html.twig', [
+        return $this->render('@ChillDocStore/DocumentCategory/new.html.twig', [
             'document_category' => $documentCategory,
             'form' => $form->createView(),
         ]);
@@ -141,7 +141,7 @@ class DocumentCategoryController extends AbstractController
             );
 
         return $this->render(
-            'ChillDocStoreBundle:DocumentCategory:show.html.twig',
+            '@ChillDocStore/DocumentCategory/show.html.twig',
             ['document_category' => $documentCategory]
         );
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
index b2244aed0..64320cc64 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
@@ -75,7 +75,7 @@ class DocumentPersonController extends AbstractController
         }
 
         return $this->render(
-            'ChillDocStoreBundle:PersonDocument:delete.html.twig',
+            '@ChillDocStore/PersonDocument/delete.html.twig',
             [
                 'document' => $document,
                 'delete_form' => $form->createView(),
@@ -134,7 +134,7 @@ class DocumentPersonController extends AbstractController
         $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         return $this->render(
-            'ChillDocStoreBundle:PersonDocument:edit.html.twig',
+            '@ChillDocStore/PersonDocument/edit.html.twig',
             [
                 'document' => $document,
                 'form' => $form->createView(),
@@ -184,7 +184,7 @@ class DocumentPersonController extends AbstractController
             $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
-        return $this->render('ChillDocStoreBundle:PersonDocument:new.html.twig', [
+        return $this->render('@ChillDocStore/PersonDocument/new.html.twig', [
             'document' => $document,
             'form' => $form->createView(),
             'person' => $person,
@@ -207,7 +207,7 @@ class DocumentPersonController extends AbstractController
         $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         return $this->render(
-            'ChillDocStoreBundle:PersonDocument:show.html.twig',
+            '@ChillDocStore/PersonDocument/show.html.twig',
             ['document' => $document, 'person' => $person]
         );
     }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
index 42f98596e..1889df97f 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
@@ -6,7 +6,7 @@
     <h1>{{ 'Document category edit'|trans }}</h1>
 
     {# DISABLED
-        {{ include('ChillDocStoreBundle:DocumentCategory:_form.html.twig', {'button_label': 'Update'}) }}
+        {{ include('@ChillDocStore/DocumentCategory/_form.html.twig', {'button_label': 'Update'}) }}
     #}
 
     {{ form_start(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
index f670609e9..481a9c0f9 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
@@ -6,7 +6,7 @@
     <h1>{{ 'Create new DocumentCategory' | trans }}</h1>
 
     {# DISABLED
-        {{ include('ChillDocStoreBundle:DocumentCategory:_form.html.twig') }}
+        {{ include('@ChillDocStore/DocumentCategory/_form.html.twig') }}
     #}
 
     {{ form_start(form) }}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
index 30a7d856b..8890d1321 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
@@ -36,7 +36,7 @@
                class="btn btn-edit">{{ 'Edit' | trans }}</a>
         </li>
         <li>
-            {{ include('ChillDocStoreBundle:DocumentCategory:_delete_form.html.twig') }}
+            {{ include('@ChillDocStore/DocumentCategory/_delete_form.html.twig') }}
         </li>
     </ul>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Controller/AdminController.php b/src/Bundle/ChillEventBundle/Controller/AdminController.php
index 88c5aeb9a..3434df9e5 100644
--- a/src/Bundle/ChillEventBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillEventBundle/Controller/AdminController.php
@@ -27,6 +27,6 @@ class AdminController extends AbstractController
      */
     public function indexAdminAction()
     {
-        return $this->render('ChillEventBundle:Admin:index.html.twig');
+        return $this->render('@ChillEvent/Admin/index.html.twig');
     }
 }
diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php
index 345f984db..bd12d3b79 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -132,7 +132,7 @@ class EventController extends AbstractController
             }
         }
 
-        return $this->render('ChillEventBundle:Event:confirm_delete.html.twig', [
+        return $this->render('@ChillEvent/Event/confirm_delete.html.twig', [
             'event_id' => $event->getId(),
             'delete_form' => $form->createView(),
         ]);
@@ -157,7 +157,7 @@ class EventController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillEventBundle:Event:edit.html.twig', [
+        return $this->render('@ChillEvent/Event/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -209,7 +209,7 @@ class EventController extends AbstractController
 
         $addEventParticipationByPersonForm = $this->createAddEventParticipationByPersonForm($person);
 
-        return $this->render('ChillEventBundle:Event:listByPerson.html.twig', [
+        return $this->render('@ChillEvent/Event/listByPerson.html.twig', [
             'participations' => $participations,
             'person' => $person,
             'paginator' => $paginator,
@@ -255,7 +255,7 @@ class EventController extends AbstractController
             return $this->redirectToRoute('chill_event__event_show', ['event_id' => $entity->getId()]);
         }
 
-        return $this->render('ChillEventBundle:Event:new.html.twig', [
+        return $this->render('@ChillEvent/Event/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -298,7 +298,7 @@ class EventController extends AbstractController
             ])
             ->getForm();
 
-        return $this->render('ChillEventBundle:Event:newPickCenter.html.twig', [
+        return $this->render('@ChillEvent/Event/newPickCenter.html.twig', [
             'form' => $form->createView(),
         ]);
     }
@@ -332,7 +332,7 @@ class EventController extends AbstractController
             return $exportParticipationsList['response'];
         }
 
-        return $this->render('ChillEventBundle:Event:show.html.twig', [
+        return $this->render('@ChillEvent/Event/show.html.twig', [
             'event' => $event,
             'form_add_participation_by_person' => $addParticipationByPersonForm->createView(),
             'form_export' => $exportParticipationsList['form']->createView(),
@@ -366,7 +366,7 @@ class EventController extends AbstractController
             return $this->redirectToRoute('chill_event__event_edit', ['event_id' => $event_id]);
         }
 
-        return $this->render('ChillEventBundle:Event:edit.html.twig', [
+        return $this->render('@ChillEvent/Event/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
diff --git a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
index 8e62716f8..8f92de174 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventTypeController.php
@@ -39,7 +39,7 @@ class EventTypeController extends AbstractController
             return $this->redirectToRoute('chill_eventtype_admin', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillEventBundle:EventType:new.html.twig', [
+        return $this->render('@ChillEvent/EventType/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -84,7 +84,7 @@ class EventTypeController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:EventType:edit.html.twig', [
+        return $this->render('@ChillEvent/EventType/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -100,7 +100,7 @@ class EventTypeController extends AbstractController
 
         $entities = $em->getRepository(\Chill\EventBundle\Entity\EventType::class)->findAll();
 
-        return $this->render('ChillEventBundle:EventType:index.html.twig', [
+        return $this->render('@ChillEvent/EventType/index.html.twig', [
             'entities' => $entities,
         ]);
     }
@@ -113,7 +113,7 @@ class EventTypeController extends AbstractController
         $entity = new EventType();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillEventBundle:EventType:new.html.twig', [
+        return $this->render('@ChillEvent/EventType/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -134,7 +134,7 @@ class EventTypeController extends AbstractController
 
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:EventType:show.html.twig', [
+        return $this->render('@ChillEvent/EventType/show.html.twig', [
             'entity' => $entity,
             'delete_form' => $deleteForm->createView(),
         ]);
@@ -163,7 +163,7 @@ class EventTypeController extends AbstractController
             return $this->redirectToRoute('chill_eventtype_admin', ['id' => $id]);
         }
 
-        return $this->render('ChillEventBundle:EventType:edit.html.twig', [
+        return $this->render('@ChillEvent/EventType/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index 075bdbd55..fac6e05b5 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -197,7 +197,7 @@ class ParticipationController extends AbstractController
             ]);
         }
 
-        return $this->render('ChillEventBundle:Participation:new.html.twig', [
+        return $this->render('@ChillEvent/Participation/new.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
         ]);
@@ -238,7 +238,7 @@ class ParticipationController extends AbstractController
             ]);
         }
 
-        return $this->render('ChillEventBundle:Participation:new.html.twig', [
+        return $this->render('@ChillEvent/Participation/new.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
         ]);
@@ -284,7 +284,7 @@ class ParticipationController extends AbstractController
             }
         }
 
-        return $this->render('ChillEventBundle:Participation:confirm_delete.html.twig', [
+        return $this->render('@ChillEvent/Participation/confirm_delete.html.twig', [
             'event_id' => $event->getId(),
             'delete_form' => $form->createView(),
         ]);
@@ -315,7 +315,7 @@ class ParticipationController extends AbstractController
 
         $form = $this->createEditForm($participation);
 
-        return $this->render('ChillEventBundle:Participation:edit.html.twig', [
+        return $this->render('@ChillEvent/Participation/edit.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
         ]);
@@ -369,7 +369,7 @@ class ParticipationController extends AbstractController
 
         $form = $this->createEditFormMultiple($event->getParticipations(), $event);
 
-        return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', [
+        return $this->render('@ChillEvent/Participation/edit-multiple.html.twig', [
             'event' => $event,
             'participations' => $event->getParticipations(),
             'form' => $form->createView(),
@@ -452,7 +452,7 @@ class ParticipationController extends AbstractController
             ]);
         }
 
-        return $this->render('ChillEventBundle:Participation:edit.html.twig', [
+        return $this->render('@ChillEvent/Participation/edit.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
         ]);
@@ -495,7 +495,7 @@ class ParticipationController extends AbstractController
             );
         }
 
-        return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', [
+        return $this->render('@ChillEvent/Participation/edit-multiple.html.twig', [
             'event' => $event,
             'participations' => $event->getParticipations(),
             'form' => $form->createView(),
@@ -677,7 +677,7 @@ class ParticipationController extends AbstractController
             $form = $this->createCreateFormMultiple($newParticipations);
 
             return $this->render(
-                'ChillEventBundle:Participation:new-multiple.html.twig',
+                '@ChillEvent/Participation/new-multiple.html.twig',
                 [
                     'form' => $form->createView(),
                     'participations' => $newParticipations,
@@ -690,7 +690,7 @@ class ParticipationController extends AbstractController
         $form = $this->createCreateForm($participation);
 
         return $this->render(
-            'ChillEventBundle:Participation:new.html.twig',
+            '@ChillEvent/Participation/new.html.twig',
             [
                 'form' => $form->createView(),
                 'participation' => $participation,
@@ -719,7 +719,7 @@ class ParticipationController extends AbstractController
 
         $form = $this->createCreateForm($participation, $returnPath);
 
-        return $this->render('ChillEventBundle:Participation:new.html.twig', [
+        return $this->render('@ChillEvent/Participation/new.html.twig', [
             'form' => $form->createView(),
             'participation' => $participation,
             'ignored_participations' => [], // this is required, see self::newMultiple
diff --git a/src/Bundle/ChillEventBundle/Controller/RoleController.php b/src/Bundle/ChillEventBundle/Controller/RoleController.php
index 7c8ee8ea9..fa0919d0a 100644
--- a/src/Bundle/ChillEventBundle/Controller/RoleController.php
+++ b/src/Bundle/ChillEventBundle/Controller/RoleController.php
@@ -39,7 +39,7 @@ class RoleController extends AbstractController
             return $this->redirectToRoute('chill_event_admin_role', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillEventBundle:Role:new.html.twig', [
+        return $this->render('@ChillEvent/Role/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -84,7 +84,7 @@ class RoleController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:Role:edit.html.twig', [
+        return $this->render('@ChillEvent/Role/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -100,7 +100,7 @@ class RoleController extends AbstractController
 
         $entities = $em->getRepository(\Chill\EventBundle\Entity\Role::class)->findAll();
 
-        return $this->render('ChillEventBundle:Role:index.html.twig', [
+        return $this->render('@ChillEvent/Role/index.html.twig', [
             'entities' => $entities,
         ]);
     }
@@ -113,7 +113,7 @@ class RoleController extends AbstractController
         $entity = new Role();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillEventBundle:Role:new.html.twig', [
+        return $this->render('@ChillEvent/Role/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -134,7 +134,7 @@ class RoleController extends AbstractController
 
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:Role:show.html.twig', [
+        return $this->render('@ChillEvent/Role/show.html.twig', [
             'entity' => $entity,
             'delete_form' => $deleteForm->createView(),
         ]);
@@ -163,7 +163,7 @@ class RoleController extends AbstractController
             return $this->redirectToRoute('chill_event_admin_role', ['id' => $id]);
         }
 
-        return $this->render('ChillEventBundle:Role:edit.html.twig', [
+        return $this->render('@ChillEvent/Role/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
diff --git a/src/Bundle/ChillEventBundle/Controller/StatusController.php b/src/Bundle/ChillEventBundle/Controller/StatusController.php
index 000d25800..0e1566fbf 100644
--- a/src/Bundle/ChillEventBundle/Controller/StatusController.php
+++ b/src/Bundle/ChillEventBundle/Controller/StatusController.php
@@ -39,7 +39,7 @@ class StatusController extends AbstractController
             return $this->redirectToRoute('chill_event_admin_status', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillEventBundle:Status:new.html.twig', [
+        return $this->render('@ChillEvent/Status/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -84,7 +84,7 @@ class StatusController extends AbstractController
         $editForm = $this->createEditForm($entity);
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:Status:edit.html.twig', [
+        return $this->render('@ChillEvent/Status/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
@@ -100,7 +100,7 @@ class StatusController extends AbstractController
 
         $entities = $em->getRepository(\Chill\EventBundle\Entity\Status::class)->findAll();
 
-        return $this->render('ChillEventBundle:Status:index.html.twig', [
+        return $this->render('@ChillEvent/Status/index.html.twig', [
             'entities' => $entities,
         ]);
     }
@@ -113,7 +113,7 @@ class StatusController extends AbstractController
         $entity = new Status();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillEventBundle:Status:new.html.twig', [
+        return $this->render('@ChillEvent/Status/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -134,7 +134,7 @@ class StatusController extends AbstractController
 
         $deleteForm = $this->createDeleteForm($id);
 
-        return $this->render('ChillEventBundle:Status:show.html.twig', [
+        return $this->render('@ChillEvent/Status/show.html.twig', [
             'entity' => $entity,
             'delete_form' => $deleteForm->createView(),
         ]);
@@ -163,7 +163,7 @@ class StatusController extends AbstractController
             return $this->redirectToRoute('chill_event_admin_status', ['id' => $id]);
         }
 
-        return $this->render('ChillEventBundle:Status:edit.html.twig', [
+        return $this->render('@ChillEvent/Status/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
index 31eaf0df6..7a5eb23cd 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
@@ -2,7 +2,7 @@
 
 {% block title 'Event : %label%'|trans({ '%label%' : event.name } ) %}
 
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block event_content -%}
 <div class="col-10">
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
index 205b8791b..151a9ec0c 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
index 9c62697f3..aeef9c19d 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
index 4c0823cdc..3474ddd01 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
index 0dbd66b17..d50a97f15 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/_ignored_participations.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/_ignored_participations.html.twig
index 0d54dd624..9451f3c2b 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/_ignored_participations.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/_ignored_participations.html.twig
@@ -1,4 +1,4 @@
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% if ignored_participations|length > 0 %}
     <p>{% transchoice ignored_participations|length %}The following people have been ignored because they are already participating on the event{% endtranschoice %}&nbsp;:</p>
@@ -7,4 +7,4 @@
             <li>{{ person_macro.render(p.person) }}</li>
         {% endfor %}
     </ul>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
index f0f522a3d..a01c51e49 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillEvent/layout.html.twig' %}
 
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block event_content -%}
 <div class="col-10">
@@ -18,11 +18,11 @@
             </tr>
         </tbody>
     </table>
-            
+
     <h2 class="mt-5">{{ 'Participations'|trans }}</h2>
-    
+
     {{ form_start(form) }}
-    
+
      <table class="table">
             <thead>
                 <tr>
@@ -47,7 +47,7 @@
                 {% endfor %}
             </tbody>
      </table>
-            
+
     <ul class="record_actions">
         <li>
             <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-cancel">
@@ -58,7 +58,7 @@
             {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
         </li>
     </ul>
-    
+
     {{ form_end(form) }}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
index db716b3dc..d1995b625 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillEvent/layout.html.twig' %}
 
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block event_content -%}
 <div class="col-10">
@@ -22,7 +22,7 @@
             </tr>
         </tbody>
     </table>
-    
+
     {{ form_start(form) }}
     {{ form_row(form.role) }}
     {{ form_row(form.status) }}
@@ -41,7 +41,7 @@
             {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
         </li>
     </ul>
-    
+
     {{ form_end(form) }}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
index 224b7265f..a9451a755 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillEvent/layout.html.twig' %}
 
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block title 'Participation creation'|trans %}
 
@@ -27,7 +27,7 @@
         </tbody>
     </table>
 
-    {% include 'ChillEventBundle:Participation:_ignored_participations.html.twig' with ignored_participations %}
+    {% include '@ChillEvent/Participation/_ignored_participations.html.twig' with ignored_participations %}
 
     {{ form_start(form) }}
     <table class="table">
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
index 3fbea8b68..8374f04ea 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
@@ -1,6 +1,6 @@
 {% extends '@ChillEvent/layout.html.twig' %}
 
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
+{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
 
 {% block title 'Participation creation'|trans %}
 
@@ -20,17 +20,17 @@
             </tr>
         </tbody>
     </table>
-            
-    {% include 'ChillEventBundle:Participation:_ignored_participations.html.twig' with ignored_participations %}
-    
+
+    {% include '@ChillEvent/Participation/_ignored_participations.html.twig' with ignored_participations %}
+
     {{ form_start(form) }}
-    
+
     {{ form_errors(form) }}
-    
+
     {{ form_row(form.role) }}
     {{ form_row(form.status) }}
-    
-    
+
+
 
     <ul class="record_actions">
         <li class="cancel">
@@ -42,7 +42,7 @@
             {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
         </li>
     </ul>
-    
+
     {{ form_end(form) }}
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
index 0c9d61795..41ad81b90 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
     <h1>{{ 'Role edit'|trans }}</h1>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
index 091b2f6ac..6010576bc 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
index 03681f30c..15363c02c 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
index 68a15958f..9fe7e3adf 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
index 3d00a66fa..00ee2d25c 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
index 144a80e51..114e2a1b1 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
index 03ba1de3a..0e0b788ad 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
index 0e0a75069..ce0aaae98 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillEventBundle:Admin:index.html.twig" %}
+{% extends "@ChillEvent/Admin/index.html.twig" %}
 
 {% block admin_content -%}
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
index 2750b285f..2e4de23e6 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
@@ -1,4 +1,4 @@
-{% import 'ChillEventBundle:EventReason:macro.html.twig' as m %}
+{% import '@ChillEvent/EventReason/macro.html.twig' as m %}
 
 {% if "now"|date('U') > event.date|date('U') %}
     {% set boolDate = 'past' %}
diff --git a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
index 9fac6c88e..2624e42f5 100644
--- a/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
+++ b/src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
@@ -116,7 +116,7 @@ class TimelineEventProvider implements TimelineProviderInterface
         $this->checkContext($context);
 
         return [
-            'template' => 'ChillEventBundle:Timeline:event_person_context.html.twig',
+            'template' => '@ChillEvent/Timeline/event_person_context.html.twig',
             'template_data' => [
                 'event' => $entity,
                 'person' => $args['person'],
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index f9491d800..caa5a8297 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -578,13 +578,12 @@ class CRUDController extends AbstractController
     /**
      * Customize template parameters.
      *
-     * @param mixed $entity
      *
      * @return array
      */
     protected function generateTemplateParameter(
         string $action,
-        $entity,
+        mixed $entity,
         Request $request,
         array $defaultTemplateParameters = []
     ) {
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
index a0c9912cf..4a502c3e7 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
@@ -63,24 +63,24 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
     /**
      * the key to use to identify widget for a given place.
      */
-    public const WIDGET_CONFIG_ALIAS = 'widget_alias';
+    final public const WIDGET_CONFIG_ALIAS = 'widget_alias';
 
     /**
      * the key to use to order widget for a given place.
      */
-    public const WIDGET_CONFIG_ORDER = 'order';
+    final public const WIDGET_CONFIG_ORDER = 'order';
 
     /**
      * The service which will manage the widgets.
      *
      * @var string
      */
-    public const WIDGET_MANAGER = 'chill.main.twig.widget';
+    final public const WIDGET_MANAGER = 'chill.main.twig.widget';
 
     /**
      * the method wich register the widget into give service.
      */
-    public const WIDGET_MANAGER_METHOD_REGISTER = 'addWidget';
+    final public const WIDGET_MANAGER_METHOD_REGISTER = 'addWidget';
 
     /**
      * the key used to collect the alias in the service definition's tag.
@@ -89,21 +89,21 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
      *
      * @var string
      */
-    public const WIDGET_SERVICE_TAG_ALIAS = 'alias';
+    final public const WIDGET_SERVICE_TAG_ALIAS = 'alias';
 
     /**
      * the value of the `name` key in service definitions's tag.
      *
      * @var string
      */
-    public const WIDGET_SERVICE_TAG_NAME = 'chill_widget';
+    final public const WIDGET_SERVICE_TAG_NAME = 'chill_widget';
 
     /**
      * the key used to collect the authorized place in the service definition's tag.
      *
      * @var string
      */
-    public const WIDGET_SERVICE_TAG_PLACES = 'place';
+    final public const WIDGET_SERVICE_TAG_PLACES = 'place';
 
     /**
      * cache of ordering by place.
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
index 748142ab8..fbb9e3f4d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
@@ -2,7 +2,7 @@
 
 <div class="flex-table accordion accordion-flush" id="notification-fold">
     {% for notification in notifications %}
-        {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
+        {% include '@ChillMain/Notification/_list_item.html.twig' with {
             'full_content': true,
             'fold_item': true,
             'action_button': true,
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
index 6dff67299..90d103aaf 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
@@ -49,7 +49,7 @@
         <div class="flex-table accordion accordion-flush" id="notification-fold">
             {% for data in datas %}
                 {% set notification = data.notification %}
-                {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
+                {% include '@ChillMain/Notification/_list_item.html.twig' with {
                     'fold_item': true,
                     'notification_cc': data.template_data.notificationCc is defined ? data.template_data.notificationCc : false
                 } %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
index 2f9d5d63f..53e296d8d 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
@@ -20,7 +20,7 @@
     <h1>{{ 'notification.Notification'|trans }}</h1>
 
     <div class="flex-table">
-        {% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
+        {% include '@ChillMain/Notification/_list_item.html.twig' with {
             'data': {
                  'template': handler.getTemplate(notification),
                  'template_data': handler.getTemplateData(notification)
@@ -32,7 +32,7 @@
         } %}
     </div>
 
-    {% include 'ChillMainBundle:Notification:_item_comments.html.twig' %}
+    {% include '@ChillMain/Notification/_item_comments.html.twig' %}
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig
index b1990833c..3c3e6d5f7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title %}{{ 'Edit my current location'|trans }}{% endblock %}
 
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig
index 1099d8452..5d8c39c63 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as macro %}
 
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
index 9ebcece18..905fae57f 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
@@ -44,7 +44,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
      *
      * Expected params :
      * - args: the arguments to build the path (i.e: if pattern is /something/{bar}, args must contain {'bar': 'foo'}
-     * - layout: the layout. Absolute path needed (i.e.: ChillXyzBundle:section:foo.html.twig)
+     * - layout: the layout. Absolute path needed (i.e.: @ChillXyz/section/foo.html.twig)
      * - activeRouteKey : the key active, will render the menu differently.
      *
      * @deprecated link: see https://redmine.champs-libres.coop/issues/179 for more informations
diff --git a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
index 2cef728c0..ca61d814f 100644
--- a/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
+++ b/src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
@@ -92,7 +92,7 @@ interface TimelineProviderInterface
      *
      * ```
      * array(
-     *    'template'      => 'ChillMyBundle:timeline:template.html.twig',
+     *    'template'      => '@ChillMy/timeline/template.html.twig',
      *    'template_data' => array(
      *             'accompanyingPeriod' => $entity,
      *              'person' => $args['person']
diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
index 1e27c2cdf..4c92227ec 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
@@ -127,7 +127,7 @@ class AccompanyingPeriodController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
             'accompanying_period' => $current,
@@ -190,7 +190,7 @@ class AccompanyingPeriodController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
             'accompanying_period' => $accompanyingPeriod,
@@ -299,7 +299,7 @@ class AccompanyingPeriodController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
             'accompanying_period' => $accompanyingPeriod,
@@ -340,7 +340,7 @@ class AccompanyingPeriodController extends AbstractController
         }
 
         if (false === $confirm && $period->canBeReOpened($person)) {
-            return $this->render('ChillPersonBundle:AccompanyingPeriod:re_open.html.twig', [
+            return $this->render('@ChillPerson/AccompanyingPeriod/re_open.html.twig', [
                 'period' => $period,
                 'person' => $person,
             ]);
@@ -417,7 +417,7 @@ class AccompanyingPeriodController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
+        return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
             'accompanying_period' => $accompanyingPeriod,
diff --git a/src/Bundle/ChillPersonBundle/Controller/AdminController.php b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
index 37218d686..0b4c7fdf2 100644
--- a/src/Bundle/ChillPersonBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/AdminController.php
@@ -24,7 +24,7 @@ class AdminController extends AbstractController
      */
     public function indexAccompanyingCourseAdminAction()
     {
-        return $this->render('ChillPersonBundle:Admin:indexAccompanyingCourse.html.twig');
+        return $this->render('@ChillPerson/Admin/indexAccompanyingCourse.html.twig');
     }
 
     /**
@@ -32,7 +32,7 @@ class AdminController extends AbstractController
      */
     public function indexHouseholdAdminAction()
     {
-        return $this->render('ChillPersonBundle:Admin:indexHousehold.html.twig');
+        return $this->render('@ChillPerson/Admin/indexHousehold.html.twig');
     }
 
     /**
@@ -40,7 +40,7 @@ class AdminController extends AbstractController
      */
     public function indexPersonAdminAction()
     {
-        return $this->render('ChillPersonBundle:Admin:indexPerson.html.twig');
+        return $this->render('@ChillPerson/Admin/indexPerson.html.twig');
     }
 
     /**
@@ -48,7 +48,7 @@ class AdminController extends AbstractController
      */
     public function indexSocialWorkAdminAction()
     {
-        return $this->render('ChillPersonBundle:Admin:indexSocialWork.html.twig');
+        return $this->render('@ChillPerson/Admin/indexSocialWork.html.twig');
     }
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
index ad4743921..5aa0b1ca7 100644
--- a/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
@@ -80,7 +80,7 @@ class HouseholdCompositionController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:HouseholdComposition:delete.html.twig',
+            '@ChillPerson/HouseholdComposition/delete.html.twig',
             [
                 'household' => $household,
                 'composition' => $composition,
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
index 133daf3be..0bb1472ba 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
@@ -89,7 +89,7 @@ class PersonAddressController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:Address:new.html.twig', [
+        return $this->render('@ChillPerson/Address/new.html.twig', [
             'person' => $person,
             'form' => $form->createView(),
         ]);
@@ -116,7 +116,7 @@ class PersonAddressController extends AbstractController
 
         $form = $this->createEditForm($person, $address);
 
-        return $this->render('ChillPersonBundle:Address:edit.html.twig', [
+        return $this->render('@ChillPerson/Address/edit.html.twig', [
             'person' => $person,
             'address' => $address,
             'form' => $form->createView(),
@@ -140,7 +140,7 @@ class PersonAddressController extends AbstractController
             'You are not allowed to edit this person.'
         );
 
-        return $this->render('ChillPersonBundle:Address:list.html.twig', [
+        return $this->render('@ChillPerson/Address/list.html.twig', [
             'person' => $person,
         ]);
     }
@@ -166,7 +166,7 @@ class PersonAddressController extends AbstractController
 
         $form = $this->createCreateForm($person, $address);
 
-        return $this->render('ChillPersonBundle:Address:new.html.twig', [
+        return $this->render('@ChillPerson/Address/new.html.twig', [
             'person' => $person,
             'form' => $form->createView(),
         ]);
@@ -218,7 +218,7 @@ class PersonAddressController extends AbstractController
             }
         }
 
-        return $this->render('ChillPersonBundle:Address:edit.html.twig', [
+        return $this->render('@ChillPerson/Address/edit.html.twig', [
             'person' => $person,
             'address' => $address,
             'form' => $form->createView(),
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 16b7c7050..ff04e1f95 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -107,7 +107,7 @@ final class PersonController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:Person:edit.html.twig',
+            '@ChillPerson/Person/edit.html.twig',
             ['person' => $person, 'form' => $form->createView()]
         );
     }
@@ -275,7 +275,7 @@ final class PersonController extends AbstractController
         $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         return $this->render(
-            'ChillPersonBundle:Person:view.html.twig',
+            '@ChillPerson/Person/view.html.twig',
             [
                 'person' => $person,
                 'cFGroup' => $this->getCFGroup(),
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
index 92f6fb197..b0d945fc0 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
@@ -92,7 +92,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
             return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
         }
 
-        return $this->render('ChillPersonBundle:PersonDuplicate:confirm.html.twig', [
+        return $this->render('@ChillPerson/PersonDuplicate/confirm.html.twig', [
             'person' => $person1,
             'person2' => $person2,
             'form' => $form->createView(),
@@ -143,7 +143,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
             return $this->redirectToRoute('chill_person_duplicate_confirm', $params);
         }
 
-        return $this->render('ChillPersonBundle:PersonDuplicate:find_manually.html.twig', [
+        return $this->render('@ChillPerson/PersonDuplicate/find_manually.html.twig', [
             'person' => $person,
             'form' => $form->createView(),
         ]);
@@ -216,7 +216,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
 
         $notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
 
-        return $this->render('ChillPersonBundle:PersonDuplicate:view.html.twig', [
+        return $this->render('@ChillPerson/PersonDuplicate/view.html.twig', [
             'person' => $person,
             'duplicatePersons' => $duplicatePersons,
             'notDuplicatePersons' => $notDuplicatePersons,
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
index 432852331..c4b84f012 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
@@ -66,7 +66,7 @@ final class PersonResourceController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:PersonResource:delete.html.twig',
+            '@ChillPerson/PersonResource/delete.html.twig',
             [
                 'person' => $personOwner,
                 'resource' => $resource,
@@ -99,7 +99,7 @@ final class PersonResourceController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:PersonResource:edit.html.twig',
+            '@ChillPerson/PersonResource/edit.html.twig',
             [
                 'person' => $personOwner,
                 'resource' => $resource,
@@ -118,7 +118,7 @@ final class PersonResourceController extends AbstractController
         $personResources = $this->personResourceRepository->findBy(['personOwner' => $personOwner->getId()]);
 
         return $this->render(
-            'ChillPersonBundle:PersonResource:list.html.twig',
+            '@ChillPerson/PersonResource/list.html.twig',
             [
                 'person' => $personOwner,
                 'personResources' => $personResources,
@@ -148,7 +148,7 @@ final class PersonResourceController extends AbstractController
         }
 
         return $this->render(
-            'ChillPersonBundle:PersonResource:create.html.twig',
+            '@ChillPerson/PersonResource/create.html.twig',
             [
                 'form' => $form->createView(),
                 'person' => $personOwner,
diff --git a/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php b/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
index a646a0894..575321e81 100644
--- a/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
@@ -49,7 +49,7 @@ class TimelinePersonController extends AbstractController
         $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
         return $this->render(
-            'ChillPersonBundle:Timeline:index.html.twig',
+            '@ChillPerson/Timeline/index.html.twig',
             [
                 'timeline' => $this->timelineBuilder->getTimelineHTML(
                     'person',
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
index 8cc15b9e0..9c4c90447 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
@@ -40,8 +40,6 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
             switch ($permissionsGroup->getName()) {
                 case 'social':
                 case 'direction':
-                    printf("Adding CHILL_PERSON_UPDATE & CHILL_PERSON_CREATE to %s permission group \n", $permissionsGroup->getName());
-
                     $permissionsGroup->addRoleScope(
                         (new RoleScope())
                             ->setRole(AccompanyingPeriodVoter::FULL)
@@ -80,7 +78,6 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
                     break;
 
                 case 'administrative':
-                    printf("Adding CHILL_PERSON_SEE to %s permission group \n", $permissionsGroup->getName());
                     $roleScopeSee = (new RoleScope())
                         ->setRole('CHILL_PERSON_SEE')
                         ->setScope(null);
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
index 8cb5ab59f..aac7df003 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title "Liste de parcours à répartir" %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index a9d51393d..5bcba7953 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -258,7 +258,7 @@
         {% endif %}
 
         <h2 class="mb-3 visually-hidden">{{ 'Last activities' |trans }}</h2>
-        {% include 'ChillActivityBundle:Activity:list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
+        {% include '@ChillActivity/Activity/list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
     </div>
     {% endblock %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
index b140bb4c1..56c6d92c3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
@@ -63,7 +63,7 @@
 
     <div class="flex-table accompanyingcourse-list">
         {% for period in acps %}
-            {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
+            {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {
                 'recordAction': _self.recordAction(period, contextEntity)
             } %}
         {% else %}
@@ -100,7 +100,7 @@
 
                     <div class="flex-table accompanyingcourse-list">
                         {% for period in acpsClosed %}
-                            {% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
+                            {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {
                                 'recordAction': _self.recordAction(period, contextEntity)
                             } %}
                         {% endfor %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
index f30bfc45a..0b3669b85 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
@@ -9,7 +9,7 @@
 
     <h1>{{ 'Accompanying period list'|trans }}</h1>
 
-    {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+    {% include '@ChillPerson/AccompanyingPeriod/_list.html.twig' %}
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
index c1144512d..c98dd253e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title 'period_by_user_list.Period by user'|trans %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
index c734eee8e..e473799ff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
@@ -7,7 +7,7 @@
 
     <h1>{{ block('title') }}</h1>
 
-    {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
+    {% include '@ChillPerson/AccompanyingPeriod/_list.html.twig' %}
 
     {% if accompanying_periods_old|length > 0 %}
             <div class="accordion" id="nonCurrent">
@@ -28,7 +28,7 @@
                         class="accordion-collapse collapse"
                         aria-labelledby="heading_{{ household.id }}"
                         data-bs-parent="#nonCurrent">
-                        {% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' with {'accompanying_periods' : accompanying_periods_old} %}
+                        {% include '@ChillPerson/AccompanyingPeriod/_list.html.twig' with {'accompanying_periods' : accompanying_periods_old} %}
                     </div>
                 </div>
             </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
index ceff2137d..094e23427 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -28,7 +28,7 @@ This view should receive those arguments:
     we define variables to include an edit form repeated multiple time across
     the page
 #}
-{% set edit_tmp_name = 'ChillPersonBundle:Form:go_to_form.html.twig'  %}
+{% set edit_tmp_name = '@ChillPerson/Form/go_to_form.html.twig'  %}
 {% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id },
       'form_path_key' : 'chill_person_general_edit' } %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
index 9603cad17..89b24e27b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
@@ -1,8 +1,8 @@
-{# 
+{#
     if the `custom_fields` option is used, the custom fields are available
     under the customFields variable, with the custom field slug as key.
 #}
-{% import 'ChillPersonBundle:Person:macro.html.twig' as person %}
+{% import '@ChillPerson/Person/macro.html.twig' as person %}
 <div class="col-8 centered">
     <h2>{{ 'Accompanyied people'|trans }}</h2>
     <table>
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
index a4b11fdb6..c5e98caa5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
@@ -54,8 +54,8 @@ final class AccompanyingCourseControllerTest extends WebTestCase
             ->findOneBy(['name' => 'Center A']);
 
         $personIds = $em->createQuery('SELECT p.id FROM ' .
-            Person::class . ' p ' .
-            ' WHERE p.center = :center')
+            Person::class . ' p JOIN p.centerCurrent cc ' .
+            ' WHERE cc.center = :center')
             ->setParameter('center', $center)
             ->setMaxResults(100)
             ->getScalarResult();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
index d6f4ca7cf..68ee8af62 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
@@ -56,6 +56,7 @@ final class PersonDuplicateControllerViewTest extends WebTestCase
 
         $crawler = $client->request('GET', '/en/person/' . $this->person->getId() . '/duplicate/view');
         $response = $client->getResponse();
+        var_dump(substr($crawler->html(), 0, 500));
         $this->assertTrue($response->isSuccessful());
 
         $this->assertGreaterThan(0, $crawler->filter('html:contains("Find duplicate")')->count());
diff --git a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
index 21cb0438c..70afcd1c2 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
@@ -36,7 +36,7 @@ class TimelineAccompanyingPeriodClosing extends AbstractTimelineAccompanyingPeri
     public function getEntityTemplate($entity, $context, array $args)
     {
         return $this->getBasicEntityTemplate(
-            'ChillPersonBundle:Timeline:closing_period.html.twig',
+            '@ChillPerson/Timeline/closing_period.html.twig',
             $entity,
             $context,
             $args
diff --git a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
index 9cd8df75f..74162ddb0 100644
--- a/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
+++ b/src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
@@ -34,7 +34,7 @@ class TimelineAccompanyingPeriodOpening extends AbstractTimelineAccompanyingPeri
     public function getEntityTemplate($entity, $context, array $args)
     {
         return $this->getBasicEntityTemplate(
-            'ChillPersonBundle:Timeline:opening_period.html.twig',
+            '@ChillPerson/Timeline/opening_period.html.twig',
             $entity,
             $context,
             $args
diff --git a/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php b/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
index 8047d3b44..ef150f91d 100644
--- a/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
@@ -25,6 +25,6 @@ class AddAPersonWidget implements WidgetInterface
         array $context,
         array $config
     ) {
-        return $env->render('ChillPersonBundle:Widget:homepage_add_a_person.html.twig');
+        return $env->render('@ChillPerson/Widget/homepage_add_a_person.html.twig');
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
index 0db3eb429..bf0d3b1b2 100644
--- a/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
+++ b/src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
@@ -127,7 +127,7 @@ class PersonListWidget implements WidgetInterface
         }
 
         return $env->render(
-            'ChillPersonBundle:Widget:homepage_person_list.html.twig',
+            '@ChillPerson/Widget/homepage_person_list.html.twig',
             [
                 'persons' => $persons,
                 'customFields' => $cfields,
diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php
index e4622913e..2762c5cbf 100644
--- a/src/Bundle/ChillReportBundle/Controller/ReportController.php
+++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php
@@ -117,7 +117,7 @@ class ReportController extends AbstractController
                     ->trans('The form is not valid. The report has not been created !')
             );
 
-        return $this->render('ChillReportBundle:Report:new.html.twig', [
+        return $this->render('@ChillReport/Report/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
             'person' => $person,
@@ -165,7 +165,7 @@ class ReportController extends AbstractController
         ]);
         $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-        return $this->render('ChillReportBundle:Report:edit.html.twig', [
+        return $this->render('@ChillReport/Report/edit.html.twig', [
             'edit_form' => $editForm->createView(),
             'person' => $person,
         ]);
@@ -246,7 +246,7 @@ class ReportController extends AbstractController
         ]);
         $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-        return $this->render('ChillReportBundle:Report:list.html.twig', [
+        return $this->render('@ChillReport/Report/list.html.twig', [
             'reports' => $reports,
             'person' => $person,
             'paginator' => $paginator,
@@ -295,7 +295,7 @@ class ReportController extends AbstractController
 
         $form = $this->createCreateForm($entity, $person, $cFGroup);
 
-        return $this->render('ChillReportBundle:Report:new.html.twig', [
+        return $this->render('@ChillReport/Report/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
             'person' => $person,
@@ -360,7 +360,7 @@ class ReportController extends AbstractController
 
         $person = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($person_id);
 
-        return $this->render('ChillReportBundle:Report:select_report_type.html.twig', [
+        return $this->render('@ChillReport/Report/select_report_type.html.twig', [
             'form' => $form->createView(),
             'person' => $person,
         ]);
@@ -407,7 +407,7 @@ class ReportController extends AbstractController
             ])
             ->getForm();
 
-        return $this->render('ChillReportBundle:Report:select_report_type_for_export.html.twig', [
+        return $this->render('@ChillReport/Report/select_report_type_for_export.html.twig', [
             'form' => $form->createView(),
             'layout_name' => '@ChillMain/Export/layout.html.twig',
         ]);
@@ -469,7 +469,7 @@ class ReportController extends AbstractController
                     ->trans('The form is not valid. The report has not been updated !')
             );
 
-        return $this->render('ChillReportBundle:Report:edit.html.twig', [
+        return $this->render('@ChillReport/Report/edit.html.twig', [
             'edit_form' => $editForm->createView(),
             'person' => $report->getPerson(),
         ]);
@@ -506,7 +506,7 @@ class ReportController extends AbstractController
         ]);
         $this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
 
-        return $this->render('ChillReportBundle:Report:view.html.twig', [
+        return $this->render('@ChillReport/Report/view.html.twig', [
             'entity' => $entity,
             'person' => $person,
         ]);
diff --git a/src/Bundle/ChillReportBundle/Search/ReportSearch.php b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
index 188faaee5..70ba3282c 100644
--- a/src/Bundle/ChillReportBundle/Search/ReportSearch.php
+++ b/src/Bundle/ChillReportBundle/Search/ReportSearch.php
@@ -56,7 +56,7 @@ class ReportSearch extends AbstractSearch implements ContainerAwareInterface
 
     public function renderResult(array $terms, $start = 0, $limit = 50, array $options = [], $format = 'html')
     {
-        return $this->container->get('templating')->render('ChillReportBundle:Search:results.html.twig', [
+        return $this->container->get('templating')->render('@ChillReport/Search/results.html.twig', [
             'reports' => $this->getReports($terms, $start, $limit),
             'total' => $this->count($terms),
             'pattern' => $this->recomposePattern($terms, ['date'], 'report'),
diff --git a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
index a5f62debc..282783b7e 100644
--- a/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+++ b/src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
@@ -77,7 +77,7 @@ class TimelineReportProvider implements TimelineProviderInterface
         $this->checkContext($context);
 
         return [
-            'template' => 'ChillReportBundle:Timeline:report.html.twig',
+            'template' => '@ChillReport/Timeline/report.html.twig',
             'template_data' => [
                 'report' => $entity,
                 'context' => $context,
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig
index bc8a042d6..8c6ac735e 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/AccompanyingCourse/list.html.twig
@@ -14,7 +14,7 @@
         {% else %}
             <div class="flex-table chill-task-list">
                 {% for task in tasks %}
-                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : false } %}
+                    {% include '@ChillTask/SingleTask/List/index_item.html.twig' with { 'showContext' : false } %}
                 {% endfor %}
             </div>
         {% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig
index b479eb948..1cb2bc228 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block title 'Tasks'|trans %}
 
@@ -14,7 +14,7 @@
         {% else %}
             <div class="flex-table chill-task-list">
                 {% for task in tasks %}
-                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : true} %}
+                    {% include '@ChillTask/SingleTask/List/index_item.html.twig' with { 'showContext' : true} %}
                 {% endfor %}
             </div>
         {% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig
index 359d02ef0..64182fe3b 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_my_tasks.html.twig
@@ -14,7 +14,7 @@
         {% else %}
             <div class="flex-table chill-task-list">
                 {% for task in tasks %}
-                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : true} %}
+                    {% include '@ChillTask/SingleTask/List/index_item.html.twig' with { 'showContext' : true} %}
                 {% endfor %}
             </div>
         {% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
index 0763dd8f3..f154205be 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
@@ -16,7 +16,7 @@
         {% else %}
             <div class="flex-table chill-task-list">
                 {% for task in tasks %}
-                    {% include 'ChillTaskBundle:SingleTask/List:index_item.html.twig' with { 'showContext' : false } %}
+                    {% include '@ChillTask/SingleTask/List/index_item.html.twig' with { 'showContext' : false } %}
                 {% endfor %}
             </div>
         {% endif %}
diff --git a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
index 8b2e5c707..70633e071 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
@@ -99,7 +99,7 @@ class SingleTaskTaskLifeCycleEventTimelineProvider implements TimelineProviderIn
         }
 
         return [
-            'template' => 'ChillTaskBundle:Timeline:single_task_transition_task_context.html.twig',
+            'template' => '@ChillTask/Timeline/single_task_transition_task_context.html.twig',
             'template_data' => [
                 'task' => $args['task'],
                 'event' => $entity,
diff --git a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
index 1fa818f41..d1f3990af 100644
--- a/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+++ b/src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
@@ -91,7 +91,7 @@ class TaskLifeCycleEventTimelineProvider implements TimelineProviderInterface
         $transition = $this->getTransitionByName($entity->getTransition(), $workflow);
 
         return [
-            'template' => 'ChillTaskBundle:Timeline:single_task_transition.html.twig',
+            'template' => '@ChillTask/Timeline/single_task_transition.html.twig',
             'template_data' => [
                 'context' => $context,
                 'event' => $entity,
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
index 145b58b8b..cdc2dc347 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
+++ b/src/Bundle/ChillWopiBundle/src/Resources/views/Editor/stored_object_failure.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillMainBundle::layout.html.twig' %}
+{% extends '@ChillMain/layout.html.twig' %}
 
 {% block content %}
     <div class="alert alert-danger">