diff --git a/Resources/views/Admin/index.html.twig b/Resources/views/Admin/index.html.twig
index 9f34add85..5fe052596 100644
--- a/Resources/views/Admin/index.html.twig
+++ b/Resources/views/Admin/index.html.twig
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 
-{% extends "ChillMainBundle::Admin/layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
 
 {% block vertical_menu_content %}
     {{ chill_menu('admin_person') }}
diff --git a/Resources/views/Person/create.html.twig b/Resources/views/Person/create.html.twig
index d7d6fda61..a55e69b6b 100644
--- a/Resources/views/Person/create.html.twig
+++ b/Resources/views/Person/create.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 "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
 
 {% block title %}{{ 'Add a person'|trans }}{% endblock title %}
     
diff --git a/Resources/views/Person/create_review.html.twig b/Resources/views/Person/create_review.html.twig
index cca78758b..e1d7fe454 100644
--- a/Resources/views/Person/create_review.html.twig
+++ b/Resources/views/Person/create_review.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 "ChillMainBundle::layout.html.twig" %}
+{% extends "@ChillMain/layout.html.twig" %}
 
 {% block title %}{{ 'Alreay existing person'|trans }}{% endblock title %}
     
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 9f6339691..899b4d67b 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -21,7 +21,7 @@
     layout.
 #}
 
-{% extends "ChillMainBundle::layoutWithVerticalMenu.html.twig" %}
+{% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
 
 
diff --git a/Widget/AddAPersonWidget.php b/Widget/AddAPersonWidget.php
index a7988ed2a..f886edee9 100644
--- a/Widget/AddAPersonWidget.php
+++ b/Widget/AddAPersonWidget.php
@@ -9,6 +9,7 @@
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
+use Twig\Environment;
 
 
 /**
@@ -19,7 +20,7 @@ use Chill\MainBundle\Templating\Widget\WidgetInterface;
 class AddAPersonWidget implements WidgetInterface
 {
     public function render(
-            \Twig_Environment $env, 
+            Environment $env,
             $place, 
             array $context, 
             array $config) {
diff --git a/Widget/PersonListWidget.php b/Widget/PersonListWidget.php
index 6166bd08d..e885e0a26 100644
--- a/Widget/PersonListWidget.php
+++ b/Widget/PersonListWidget.php
@@ -30,6 +30,7 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Role\Role;
 use Doctrine\ORM\EntityManager;
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Twig\Environment;
 
 /**
  * add a widget with person list. 
@@ -93,7 +94,7 @@ class PersonListWidget implements WidgetInterface
      * @param array $config
      * @return string
      */
-    public function render(\Twig_Environment $env, $place, array $context, array $config)
+    public function render(Environment $env, $place, array $context, array $config)
     { 
         $numberOfItems = $config['number_of_items'] ?? 20;