diff --git a/Resources/views/Admin/layout.html.twig b/Resources/views/Admin/layout.html.twig
index b0e954170..160b488eb 100644
--- a/Resources/views/Admin/layout.html.twig
+++ b/Resources/views/Admin/layout.html.twig
@@ -20,7 +20,7 @@
{% block vertical_menu_content %}
{{ chill_menu('admin_events', {
- 'layout': 'ChillEventBundle::Admin/menu.html.twig',
+ 'layout': '@ChillEvent/Admin/menu.html.twig',
}) }}
{% endblock %}
diff --git a/Resources/views/Event/confirm_delete.html.twig b/Resources/views/Event/confirm_delete.html.twig
index a9f472f79..86b7c6fd2 100644
--- a/Resources/views/Event/confirm_delete.html.twig
+++ b/Resources/views/Event/confirm_delete.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% set activeRouteKey = 'chill_event__event_show' %}
diff --git a/Resources/views/Event/edit.html.twig b/Resources/views/Event/edit.html.twig
index a5b69a420..97b32b328 100644
--- a/Resources/views/Event/edit.html.twig
+++ b/Resources/views/Event/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% block title 'Event edit'|trans %}
diff --git a/Resources/views/Event/listByPerson.html.twig b/Resources/views/Event/listByPerson.html.twig
index 4635946d9..4a9a9f6c5 100644
--- a/Resources/views/Event/listByPerson.html.twig
+++ b/Resources/views/Event/listByPerson.html.twig
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
#}
-{% extends "ChillPersonBundle::layout.html.twig" %}
+{% extends "@ChillPerson/layout.html.twig" %}
{% set activeRouteKey = 'chill_event__list_by_person' %}
{% set currentPerson = person.firstName ~ ' ' ~ person.lastName %}
diff --git a/Resources/views/Event/new.html.twig b/Resources/views/Event/new.html.twig
index 2da0a6bac..33a826f85 100644
--- a/Resources/views/Event/new.html.twig
+++ b/Resources/views/Event/new.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% block title 'Event creation'|trans %}
diff --git a/Resources/views/Event/newPickCenter.html.twig b/Resources/views/Event/newPickCenter.html.twig
index 753610009..06c29a924 100644
--- a/Resources/views/Event/newPickCenter.html.twig
+++ b/Resources/views/Event/newPickCenter.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% block title 'Event creation'|trans %}
diff --git a/Resources/views/Event/show.html.twig b/Resources/views/Event/show.html.twig
index 881cda742..f699102f8 100644
--- a/Resources/views/Event/show.html.twig
+++ b/Resources/views/Event/show.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% block title 'Event : %label%'|trans({ '%label%' : event.name } ) %}
diff --git a/Resources/views/Participation/confirm_delete.html.twig b/Resources/views/Participation/confirm_delete.html.twig
index 20bed0940..9b023a915 100644
--- a/Resources/views/Participation/confirm_delete.html.twig
+++ b/Resources/views/Participation/confirm_delete.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% set activeRouteKey = 'chill_event__event_show' %}
diff --git a/Resources/views/Participation/edit-multiple.html.twig b/Resources/views/Participation/edit-multiple.html.twig
index a9acabe47..6db322b69 100644
--- a/Resources/views/Participation/edit-multiple.html.twig
+++ b/Resources/views/Participation/edit-multiple.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
diff --git a/Resources/views/Participation/edit.html.twig b/Resources/views/Participation/edit.html.twig
index 2aa336b44..0f24ae1f6 100644
--- a/Resources/views/Participation/edit.html.twig
+++ b/Resources/views/Participation/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
diff --git a/Resources/views/Participation/new-multiple.html.twig b/Resources/views/Participation/new-multiple.html.twig
index 8cdfed800..f73744a59 100644
--- a/Resources/views/Participation/new-multiple.html.twig
+++ b/Resources/views/Participation/new-multiple.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
diff --git a/Resources/views/Participation/new.html.twig b/Resources/views/Participation/new.html.twig
index ba90e3eda..514161c35 100644
--- a/Resources/views/Participation/new.html.twig
+++ b/Resources/views/Participation/new.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillEventBundle::layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}