diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
index 242ebc188..1a104a3be 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
@@ -40,7 +40,7 @@ class ActivityReasonCategoryController extends AbstractController
             return $this->redirectToRoute('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]);
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -62,7 +62,7 @@ class ActivityReasonCategoryController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -78,7 +78,7 @@ class ActivityReasonCategoryController extends AbstractController
 
         $entities = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityReasonCategory::class)->findAll();
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/index.html.twig', [
             'entities' => $entities,
         ]);
     }
@@ -92,7 +92,7 @@ class ActivityReasonCategoryController extends AbstractController
         $entity = new ActivityReasonCategory();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -112,7 +112,7 @@ class ActivityReasonCategoryController extends AbstractController
             throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/show.html.twig', [
             'entity' => $entity,
         ]);
     }
@@ -140,7 +140,7 @@ class ActivityReasonCategoryController extends AbstractController
             return $this->redirectToRoute('chill_activity_activityreasoncategory_edit', ['id' => $id]);
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+        return $this->render('@ChillActivity/ActivityReasonCategory/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
index 9144bb129..cbf0ba9ec 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php
@@ -24,6 +24,6 @@ class AdminController extends AbstractController
      */
     public function indexAdminAction()
     {
-        return $this->render('ChillAsideActivityBundle:Admin:index.html.twig');
+        return $this->render('@ChillAsideActivity/Admin/index.html.twig');
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
index 882b1c120..eda55bb87 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/AdminController.php
@@ -26,6 +26,6 @@ class AdminController extends AbstractController
      */
     public function indexAction(): Response
     {
-        return $this->render('ChillCustomFieldsBundle:Admin:layout.html.twig');
+        return $this->render('@ChillCustomFields/Admin/layout.html.twig');
     }
 }
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
index 6ac594007..fff8e3216 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
@@ -48,7 +48,7 @@ class CustomFieldController extends AbstractController
         $this->addFlash('error', $this->get('translator')
             ->trans('The custom field form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:new.html.twig', [
+        return $this->render('@ChillCustomFields/CustomField/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -71,7 +71,7 @@ class CustomFieldController extends AbstractController
 
         $editForm = $this->createEditForm($entity, $entity->getType());
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:edit.html.twig', [
+        return $this->render('@ChillCustomFields/CustomField/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -103,7 +103,7 @@ class CustomFieldController extends AbstractController
 
         $form = $this->createCreateForm($entity, $request->query->get('type'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:new.html.twig', [
+        return $this->render('@ChillCustomFields/CustomField/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -138,7 +138,7 @@ class CustomFieldController extends AbstractController
         $this->addFlash('error', $this->get('translator')
             ->trans('The custom field form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomField:edit.html.twig', [
+        return $this->render('@ChillCustomFields/CustomField/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
diff --git a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
index 976193f1d..e6ac19b74 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
@@ -63,7 +63,7 @@ class CustomFieldsGroupController extends AbstractController
         $this->addFlash('error', $this->translator
             ->trans('The custom fields group form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:new.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -85,7 +85,7 @@ class CustomFieldsGroupController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:edit.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
@@ -111,7 +111,7 @@ class CustomFieldsGroupController extends AbstractController
             }
         }
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:index.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/index.html.twig', [
             'entities' => $cfGroups,
             'default_groups' => $defaultGroups,
             'make_default_forms' => $makeDefaultFormViews,
@@ -174,7 +174,7 @@ class CustomFieldsGroupController extends AbstractController
         $entity = new CustomFieldsGroup();
         $form = $this->createCreateForm($entity);
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:new.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/new.html.twig', [
             'entity' => $entity,
             'form' => $form->createView(),
         ]);
@@ -213,7 +213,7 @@ class CustomFieldsGroupController extends AbstractController
 
         if ($form->isSubmitted()) {
             if ($form->get('submit_render')->isClicked()) {
-                return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:render_for_test.html.twig', [
+                return $this->render('@ChillCustomFields/CustomFieldsGroup/render_for_test.html.twig', [
                     'fields' => $form->getData(),
                     'customFieldsGroup' => $entity,
                 ]);
@@ -247,7 +247,7 @@ class CustomFieldsGroupController extends AbstractController
 
         $options = $this->getOptionsAvailable($entity->getEntity());
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:show.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/show.html.twig', [
             'entity' => $entity,
             'create_field_form' => $this->createCreateFieldForm($entity)->createView(),
             'options' => $options,
@@ -284,7 +284,7 @@ class CustomFieldsGroupController extends AbstractController
         $this->addFlash('error', $this->translator
             ->trans('The custom fields group form contains errors'));
 
-        return $this->render('ChillCustomFieldsBundle:CustomFieldsGroup:edit.html.twig', [
+        return $this->render('@ChillCustomFields/CustomFieldsGroup/edit.html.twig', [
             'entity' => $entity,
             'edit_form' => $editForm->createView(),
         ]);
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
index d35b2f915..27a4f930f 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
@@ -289,7 +289,7 @@ class CustomFieldChoice extends AbstractCustomField
             $choices[] = ['name' => $value['_other'], 'slug' => '_other'];
         }
 
-        $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice.html.twig';
+        $template = '@ChillCustomFields/CustomFieldsRendering/choice.html.twig';
 
         if ('csv' === $documentType) {
             $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:choice.csv.twig';
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
index fa8033506..0584d770d 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
@@ -90,7 +90,7 @@ class CustomFieldText extends AbstractCustomField
 
     public function render($value, CustomField $customField, $documentType = 'html')
     {
-        $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:text.html.twig';
+        $template = '@ChillCustomFields/CustomFieldsRendering/text.html.twig';
 
         if ('csv' === $documentType) {
             $template = 'ChillCustomFieldsBundle:CustomFieldsRendering:text.csv.twig';
diff --git a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
index c1f7e4066..305cc6c3e 100644
--- a/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+++ b/src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
@@ -82,7 +82,7 @@ class CustomFieldTitle extends AbstractCustomField
     {
         return $this->templating
             ->render(
-                'ChillCustomFieldsBundle:CustomFieldsRendering:title.html.twig',
+                '@ChillCustomFields/CustomFieldsRendering/title.html.twig',
                 [
                     'title' => $customField->getName(),
                     'type' => $customField->getOptions()[self::TYPE],
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
index 15a4c7003..1b7ab606b 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
@@ -77,7 +77,7 @@ class CustomFieldRenderingTwig extends AbstractExtension
      * Twig Extension that is used to render the label of a custom field.
      *
      * @param CustomField $customField Either a customField OR a customizable_entity OR the FQDN of the entity
-     * @param array $params The parameters for rendering. Currently, 'label_layout' allow to choose a different label. Default is 'ChillCustomFieldsBundle:CustomField:render_label.html.twig'
+     * @param array $params The parameters for rendering. Currently, 'label_layout' allow to choose a different label. Default is '@ChillCustomFields/CustomField/render_label.html.twig'
      *
      * @return string HTML representation of the custom field label.
      */
diff --git a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
index 5a690586b..9d0537750 100644
--- a/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
+++ b/src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
@@ -76,7 +76,7 @@ final class CustomFieldsGroupRenderingTwig extends AbstractExtension
      * @param string $documentType The type of the document (csv, html)
      * @param array $params The parameters for rendering :
      *  - layout : allow to choose a different layout by default :
-     *             ChillCustomFieldsBundle:CustomFieldsGroup:render.html.twig
+     *             @ChillCustomFields/CustomFieldsGroup/render.html.twig
      *  - show_empty : force show empty field
      *
      * @return string HTML representation of the custom field group value, as described in
diff --git a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
index 50b16d318..efe371337 100644
--- a/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
@@ -68,7 +68,7 @@ class DocumentAccompanyingCourseController extends AbstractController
         }
 
         return $this->render(
-            'ChillDocStoreBundle:AccompanyingCourseDocument:delete.html.twig',
+            '@ChillDocStore/AccompanyingCourseDocument/delete.html.twig',
             [
                 'document' => $document,
                 'delete_form' => $form->createView(),
@@ -109,7 +109,7 @@ class DocumentAccompanyingCourseController extends AbstractController
         }
 
         return $this->render(
-            'ChillDocStoreBundle:AccompanyingCourseDocument:edit.html.twig',
+            '@ChillDocStore/AccompanyingCourseDocument/edit.html.twig',
             [
                 'document' => $document,
                 'form' => $form->createView(),
@@ -157,7 +157,7 @@ class DocumentAccompanyingCourseController extends AbstractController
             $this->addFlash('error', $this->translator->trans('This form contains errors'));
         }
 
-        return $this->render('ChillDocStoreBundle:AccompanyingCourseDocument:new.html.twig', [
+        return $this->render('@ChillDocStore/AccompanyingCourseDocument/new.html.twig', [
             'document' => $document,
             'form' => $form->createView(),
             'accompanyingCourse' => $course,
@@ -172,7 +172,7 @@ class DocumentAccompanyingCourseController extends AbstractController
         $this->denyAccessUnlessGranted(AccompanyingCourseDocumentVoter::SEE_DETAILS, $document);
 
         return $this->render(
-            'ChillDocStoreBundle:AccompanyingCourseDocument:show.html.twig',
+            '@ChillDocStore/AccompanyingCourseDocument/show.html.twig',
             ['document' => $document, 'accompanyingCourse' => $course]
         );
     }
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig
index aea0269ea..87b9c4086 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/List/index_item.html.twig
@@ -3,7 +3,7 @@
         <div class="item-col">
             <div class="denomination h2">
                 {{ task.title }}
-                {% for place in workflow_marked_places(task) %}
+                {% for place in  workflow_marked_places(task) %}
                     <span class="task-status badge type-{{ task.type }} place-{{ place }}">
                         {{ place|trans }}
                     </span>
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
index 4f430b91c..559310be6 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/AdminController.php
@@ -23,6 +23,6 @@ class AdminController extends AbstractController
      */
     public function indexAdminAction()
     {
-        return $this->render('ChillThirdPartyBundle:Admin:index.html.twig');
+        return $this->render('@ChillThirdParty/Admin/index.html.twig');
     }
 }