diff --git a/Form/ActivityReasonCategoryType.php b/Form/ActivityReasonCategoryType.php
index 43b7dfe0f..5f566393f 100644
--- a/Form/ActivityReasonCategoryType.php
+++ b/Form/ActivityReasonCategoryType.php
@@ -35,7 +35,7 @@ class ActivityReasonCategoryType extends AbstractType
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'chill_activitybundle_activityreasoncategory';
     }
diff --git a/Form/ActivityReasonType.php b/Form/ActivityReasonType.php
index a7fad4a2f..f46930faa 100644
--- a/Form/ActivityReasonType.php
+++ b/Form/ActivityReasonType.php
@@ -37,7 +37,7 @@ class ActivityReasonType extends AbstractType
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'chill_activitybundle_activityreason';
     }
diff --git a/Form/ActivityType.php b/Form/ActivityType.php
index 68ecf2794..30f5d2e88 100644
--- a/Form/ActivityType.php
+++ b/Form/ActivityType.php
@@ -187,7 +187,7 @@ class ActivityType extends AbstractType
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'chill_activitybundle_activity';
     }
diff --git a/Form/ActivityTypeType.php b/Form/ActivityTypeType.php
index 55e4bace1..b3d400bf8 100644
--- a/Form/ActivityTypeType.php
+++ b/Form/ActivityTypeType.php
@@ -41,7 +41,7 @@ class ActivityTypeType extends AbstractType
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'chill_activitybundle_activitytype';
     }
diff --git a/Form/Type/TranslatableActivityReason.php b/Form/Type/TranslatableActivityReason.php
index 2a41d4210..af8a7dcd1 100644
--- a/Form/Type/TranslatableActivityReason.php
+++ b/Form/Type/TranslatableActivityReason.php
@@ -43,7 +43,7 @@ class TranslatableActivityReason extends AbstractType
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'translatable_activity_reason';
     }
diff --git a/Form/Type/TranslatableActivityReasonCategory.php b/Form/Type/TranslatableActivityReasonCategory.php
index c01ff2a01..6dd04023c 100644
--- a/Form/Type/TranslatableActivityReasonCategory.php
+++ b/Form/Type/TranslatableActivityReasonCategory.php
@@ -47,7 +47,7 @@ class TranslatableActivityReasonCategory extends AbstractType
         $this->requestStack = $requestStack;
     }
 
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'translatable_activity_reason_category';
     }
diff --git a/Form/Type/TranslatableActivityType.php b/Form/Type/TranslatableActivityType.php
index 89399e551..f21184a30 100644
--- a/Form/Type/TranslatableActivityType.php
+++ b/Form/Type/TranslatableActivityType.php
@@ -2,20 +2,20 @@
 
 /*
  * Chill is a software for social workers
- * 
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
+ *
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
  * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * 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/>.
  */
@@ -37,15 +37,15 @@ use Chill\ActivityBundle\Entity\ActivityType;
  */
 class TranslatableActivityType extends AbstractType
 {
-    
+
     /**
      *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-    
+
     protected $activityTypeRepository;
-    
+
     public function __construct(
             TranslatableStringHelper $helper,
             EntityRepository $activityTypeRepository
@@ -54,30 +54,30 @@ class TranslatableActivityType extends AbstractType
         $this->translatableStringHelper = $helper;
         $this->activityTypeRepository = $activityTypeRepository;
     }
-    
-    public function getName()
+
+    public function getBlockPrefix()
     {
         return 'translatable_activity_type';
     }
-    
+
     public function getParent()
     {
         return EntityType::class;
     }
-    
+
     public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder, array $options) {
         /* @var $qb \Doctrine\ORM\QueryBuilder */
         $qb = $options['query_builder'];
-        
+
         if ($options['active_only'] === true) {
             $qb->where($qb->expr()->eq('at.active', ':active'));
             $qb->setParameter('active', true, \Doctrine\DBAL\Types\Type::BOOLEAN);
-        } 
+        }
     }
-    
+
     public function configureOptions(OptionsResolver $resolver)
     {
-        
+
         $resolver->setDefaults(
             array(
                 'class' => 'ChillActivityBundle:ActivityType',