diff --git a/Templating/Twig/CustomFieldRenderingTwig.php b/Templating/Twig/CustomFieldRenderingTwig.php
index a802e331c..38451a250 100644
--- a/Templating/Twig/CustomFieldRenderingTwig.php
+++ b/Templating/Twig/CustomFieldRenderingTwig.php
@@ -27,6 +27,8 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Container;
 use Chill\CustomFieldsBundle\Entity\CustomField;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
 /**
  * Add the following Twig Extension :
@@ -35,7 +37,7 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class CustomFieldRenderingTwig extends \Twig_Extension implements ContainerAwareInterface
+class CustomFieldRenderingTwig extends AbstractExtension implements ContainerAwareInterface
 {
 
     /** @var Container $container The container */
@@ -72,7 +74,7 @@ class CustomFieldRenderingTwig extends \Twig_Extension implements ContainerAware
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('chill_custom_field_widget', array(
+            new TwigFunction('chill_custom_field_widget', array(
                 $this,
                 'renderWidget'
             ), array(
@@ -80,7 +82,7 @@ class CustomFieldRenderingTwig extends \Twig_Extension implements ContainerAware
                     'html'
                 )
             )),
-            new \Twig_SimpleFunction('chill_custom_field_label', array(
+            new TwigFunction('chill_custom_field_label', array(
                 $this,
                 'renderLabel'
             ), array(
@@ -88,7 +90,7 @@ class CustomFieldRenderingTwig extends \Twig_Extension implements ContainerAware
                     'html'
                 )
             )),
-            new \Twig_SimpleFunction('chill_custom_field_is_empty', array(
+            new TwigFunction('chill_custom_field_is_empty', array(
                 $this,
                 'isEmptyValue'
             ))
diff --git a/Templating/Twig/CustomFieldsGroupRenderingTwig.php b/Templating/Twig/CustomFieldsGroupRenderingTwig.php
index a6b9305c0..10758d26d 100644
--- a/Templating/Twig/CustomFieldsGroupRenderingTwig.php
+++ b/Templating/Twig/CustomFieldsGroupRenderingTwig.php
@@ -25,7 +25,8 @@ namespace Chill\CustomFieldsBundle\Templating\Twig;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Container;
-use Chill\CustomFieldsBundle\Entity\CustomField;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
 /**
  * Add the following Twig Extension :
@@ -35,7 +36,7 @@ use Chill\CustomFieldsBundle\Entity\CustomField;
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @author Marc Ducobu <marc.ducobu@champs-libres.coop>
  */
-class CustomFieldsGroupRenderingTwig extends \Twig_Extension implements ContainerAwareInterface
+class CustomFieldsGroupRenderingTwig extends AbstractExtension implements ContainerAwareInterface
 {
     
     /** @var Container $container The container */
@@ -72,7 +73,7 @@ class CustomFieldsGroupRenderingTwig extends \Twig_Extension implements Containe
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('chill_custom_fields_group_widget', array(
+            new TwigFunction('chill_custom_fields_group_widget', array(
                 $this,
                 'renderWidget'
             ), array(