diff --git a/Resources/views/Address/list.html.twig b/Resources/views/Address/list.html.twig
index 87e8924e3..65f025794 100644
--- a/Resources/views/Address/list.html.twig
+++ b/Resources/views/Address/list.html.twig
@@ -16,7 +16,7 @@
 #}
 {% extends "ChillPersonBundle::layout.html.twig"  %}
 
-{% import 'ChillMainBundle:Address:macro.html.twig' as address_macros %}
+{% import '@ChillMain/Address/macro.html.twig' as address_macros %}
 
 {% set activeRouteKey = '' %}
 
diff --git a/Resources/views/Person/edit.html.twig b/Resources/views/Person/edit.html.twig
index 7ed9a2ad3..26e7d81fd 100644
--- a/Resources/views/Person/edit.html.twig
+++ b/Resources/views/Person/edit.html.twig
@@ -24,7 +24,7 @@
 
     <h1>{{ 'Update details for %name%'|trans({ '%name%': person.firstName|capitalize ~ ' ' ~ person.lastName|capitalize } ) }}</h1>
 
-{% form_theme form 'ChillMainBundle:Form:fields.html.twig' %}
+{% form_theme form '@ChillMain/Form/fields.html.twig' %}
 
 {{ form_start(form) }}
 
diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig
index 3194f9dad..b0bcfaac9 100644
--- a/Resources/views/Person/view.html.twig
+++ b/Resources/views/Person/view.html.twig
@@ -16,7 +16,7 @@
 #}
 {% extends "ChillPersonBundle::layout.html.twig"  %}
 
-{% import 'ChillMainBundle:Address:macro.html.twig' as address %}
+{% import '@ChillMain/Address/macro.html.twig' as address %}
 
 {% set activeRouteKey = 'chill_person_view' %}