diff --git a/Resources/views/Activity/confirm_delete.html.twig b/Resources/views/Activity/confirm_delete.html.twig
index f87f504b8..5cd8f15a0 100644
--- a/Resources/views/Activity/confirm_delete.html.twig
+++ b/Resources/views/Activity/confirm_delete.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 {% set person = activity.person %}
diff --git a/Resources/views/Activity/edit.html.twig b/Resources/views/Activity/edit.html.twig
index 0c52cadf4..3f7d3d664 100644
--- a/Resources/views/Activity/edit.html.twig
+++ b/Resources/views/Activity/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 = 'chill_activity_activity_list' %}
 
diff --git a/Resources/views/Activity/list.html.twig b/Resources/views/Activity/list.html.twig
index c5810c54d..0e1f2afce 100644
--- a/Resources/views/Activity/list.html.twig
+++ b/Resources/views/Activity/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"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
diff --git a/Resources/views/Activity/new.html.twig b/Resources/views/Activity/new.html.twig
index d380b61d5..b77e352d6 100644
--- a/Resources/views/Activity/new.html.twig
+++ b/Resources/views/Activity/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 = 'chill_activity_activity_new' %}
 
diff --git a/Resources/views/Activity/show.html.twig b/Resources/views/Activity/show.html.twig
index 3fa5a1495..aef642a59 100644
--- a/Resources/views/Activity/show.html.twig
+++ b/Resources/views/Activity/show.html.twig
@@ -1,4 +1,4 @@
-{% extends "ChillPersonBundle::layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
diff --git a/Resources/views/ActivityReason/edit.html.twig b/Resources/views/ActivityReason/edit.html.twig
index d7f8e782f..11d9ef074 100644
--- a/Resources/views/ActivityReason/edit.html.twig
+++ b/Resources/views/ActivityReason/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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReason edit'|trans }}</h1>
diff --git a/Resources/views/ActivityReason/index.html.twig b/Resources/views/ActivityReason/index.html.twig
index fbee5efcf..588c4b45b 100644
--- a/Resources/views/ActivityReason/index.html.twig
+++ b/Resources/views/ActivityReason/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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReason list'|trans }}</h1>
diff --git a/Resources/views/ActivityReason/new.html.twig b/Resources/views/ActivityReason/new.html.twig
index e033ec6c0..a9a3ea6ac 100644
--- a/Resources/views/ActivityReason/new.html.twig
+++ b/Resources/views/ActivityReason/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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReason creation'|trans }}</h1>
diff --git a/Resources/views/ActivityReason/show.html.twig b/Resources/views/ActivityReason/show.html.twig
index e9d07d5b6..5b58d7064 100644
--- a/Resources/views/ActivityReason/show.html.twig
+++ b/Resources/views/ActivityReason/show.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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReason'|trans }}</h1>
diff --git a/Resources/views/ActivityReasonCategory/edit.html.twig b/Resources/views/ActivityReasonCategory/edit.html.twig
index 2ff334b3b..f829625f7 100644
--- a/Resources/views/ActivityReasonCategory/edit.html.twig
+++ b/Resources/views/ActivityReasonCategory/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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory edit'|trans }}</h1>
diff --git a/Resources/views/ActivityReasonCategory/index.html.twig b/Resources/views/ActivityReasonCategory/index.html.twig
index 606d17b72..20a65f391 100644
--- a/Resources/views/ActivityReasonCategory/index.html.twig
+++ b/Resources/views/ActivityReasonCategory/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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory list'|trans }}</h1>
diff --git a/Resources/views/ActivityReasonCategory/new.html.twig b/Resources/views/ActivityReasonCategory/new.html.twig
index 8f90f8909..dba2c2fcd 100644
--- a/Resources/views/ActivityReasonCategory/new.html.twig
+++ b/Resources/views/ActivityReasonCategory/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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory creation'|trans }}</h1>
diff --git a/Resources/views/ActivityReasonCategory/show.html.twig b/Resources/views/ActivityReasonCategory/show.html.twig
index 37fbffe3a..d85972068 100644
--- a/Resources/views/ActivityReasonCategory/show.html.twig
+++ b/Resources/views/ActivityReasonCategory/show.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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityReasonCategory'|trans }}</h1>
diff --git a/Resources/views/ActivityType/edit.html.twig b/Resources/views/ActivityType/edit.html.twig
index fafcf519f..c3f2d9e69 100644
--- a/Resources/views/ActivityType/edit.html.twig
+++ b/Resources/views/ActivityType/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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityType edit'|trans }}</h1>
diff --git a/Resources/views/ActivityType/index.html.twig b/Resources/views/ActivityType/index.html.twig
index 7c4a77c89..b27fb168c 100644
--- a/Resources/views/ActivityType/index.html.twig
+++ b/Resources/views/ActivityType/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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityType list'|trans }}</h1>
diff --git a/Resources/views/ActivityType/new.html.twig b/Resources/views/ActivityType/new.html.twig
index d356e12d3..efb329ca5 100644
--- a/Resources/views/ActivityType/new.html.twig
+++ b/Resources/views/ActivityType/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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityType creation'|trans }}</h1>
diff --git a/Resources/views/ActivityType/show.html.twig b/Resources/views/ActivityType/show.html.twig
index 6e4e656be..cb7b4e3d3 100644
--- a/Resources/views/ActivityType/show.html.twig
+++ b/Resources/views/ActivityType/show.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 "ChillActivityBundle::Admin/layout_activity.html.twig" %}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
 {% block admin_content %}
     <h1>{{ 'ActivityType'|trans }}</h1>
diff --git a/Resources/views/Admin/layout_activity.html.twig b/Resources/views/Admin/layout_activity.html.twig
index 8710a227f..bf658e505 100644
--- a/Resources/views/Admin/layout_activity.html.twig
+++ b/Resources/views/Admin/layout_activity.html.twig
@@ -20,7 +20,7 @@
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_activity', {
-        'layout': 'ChillActivityBundle::Admin/menu_activity.html.twig',
+        'layout': '@ChillActivity/Admin/menu_activity.html.twig',
     }) }}
 {% endblock %}