diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
index 65edd5155..3e9d6c86f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillPersonBundle:AccompanyingCourse:layout.html.twig' %}
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
 
 {% set title = 'DRAFT' == accompanyingCourse.step ? 'New accompanying course' : 'Edit accompanying course' %}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
index cc195636b..5b0ada868 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/history.html.twig
@@ -1,4 +1,4 @@
-{% extends 'ChillPersonBundle:AccompanyingCourse:layout.html.twig' %}
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
 
 {% block title %}
     {{ 'Accompanying Course Details'|trans }}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 83b1d7320..d0a118f62 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -1,4 +1,5 @@
-{% extends 'ChillPersonBundle:AccompanyingCourse:layout.html.twig' %}
+{% extends '@ChillPerson/AccompanyingCourse/layout.html.twig' %}
+
 {% import '@ChillMain/Address/macro.html.twig' as address %}
 
 {% block title %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
index ff1901fe3..0ad699414 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
@@ -1,7 +1,7 @@
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 {% block top_banner %}
-    {{ include('ChillPersonBundle:AccompanyingCourse:banner.html.twig', { title: block('title') }) }}
+    {{ include('@ChillPerson/AccompanyingCourse/banner.html.twig', { title: block('title') }) }}
 {% endblock %}
 
 {% block layout_wvm_content %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
index ffc0df206..3d96b6022 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Household/layout.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 {% block top_banner %}
     {{ include('@ChillPerson/Household/banner.html.twig', { title: block('title') }) }}
@@ -14,4 +14,3 @@
         'args' : { 'household': household }
     }) }}
 {% endblock %}
-