diff --git a/Resources/views/AccompanyingPeriod/form.html.twig b/Resources/views/AccompanyingPeriod/form.html.twig
index 05d6b5d38..4a1ee689b 100644
--- a/Resources/views/AccompanyingPeriod/form.html.twig
+++ b/Resources/views/AccompanyingPeriod/form.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = null %}
 
diff --git a/Resources/views/AccompanyingPeriod/list.html.twig b/Resources/views/AccompanyingPeriod/list.html.twig
index 7a41eb0d8..628870ab0 100644
--- a/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/Resources/views/AccompanyingPeriod/list.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_accompanying_period_list' %}
 
diff --git a/Resources/views/AccompanyingPeriod/re_open.html.twig b/Resources/views/AccompanyingPeriod/re_open.html.twig
index 472b43c38..258ffd66e 100644
--- a/Resources/views/AccompanyingPeriod/re_open.html.twig
+++ b/Resources/views/AccompanyingPeriod/re_open.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_accompanying_period_list' %}
 
diff --git a/Resources/views/Address/edit.html.twig b/Resources/views/Address/edit.html.twig
index 55f07efcf..eea76b5fe 100644
--- a/Resources/views/Address/edit.html.twig
+++ b/Resources/views/Address/edit.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 <http://www.gnu.org/licenses/>.
 #}
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
diff --git a/Resources/views/Address/list.html.twig b/Resources/views/Address/list.html.twig
index ed7d6dd96..4af752e6b 100644
--- a/Resources/views/Address/list.html.twig
+++ b/Resources/views/Address/list.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 <http://www.gnu.org/licenses/>.
 #}
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% import '@ChillMain/Address/macro.html.twig' as address_macros %}
 
diff --git a/Resources/views/Address/new.html.twig b/Resources/views/Address/new.html.twig
index 2513a001c..9e94d7804 100644
--- a/Resources/views/Address/new.html.twig
+++ b/Resources/views/Address/new.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 <http://www.gnu.org/licenses/>.
 #}
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
diff --git a/Resources/views/Person/edit.html.twig b/Resources/views/Person/edit.html.twig
index 26e7d81fd..62cc0c259 100644
--- a/Resources/views/Person/edit.html.twig
+++ b/Resources/views/Person/edit.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 <http://www.gnu.org/licenses/>.
 #}
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig
index 32422c266..09ac9178b 100644
--- a/Resources/views/Person/view.html.twig
+++ b/Resources/views/Person/view.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 <http://www.gnu.org/licenses/>.
 #}
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% import '@ChillMain/Address/macro.html.twig' as address %}
 
diff --git a/Resources/views/Timeline/index.html.twig b/Resources/views/Timeline/index.html.twig
index 07ec9ee66..ece7b50ee 100644
--- a/Resources/views/Timeline/index.html.twig
+++ b/Resources/views/Timeline/index.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 <http://www.gnu.org/licenses/>.
 #}
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_timeline' %}
 
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 819c10526..6e3d7aa41 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -90,7 +90,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('person', {
-        'layout': 'ChillPersonBundle::menu.html.twig',
+        'layout': '@ChillPerson/menu.html.twig',
         'args' : {'person_id': person.id, 'person': person },
         'activeRouteKey': activeRouteKey
     }) }}