diff --git a/CLChillPersonBundle.php b/CLChillPersonBundle.php
index f3f47a646..847e46e3b 100644
--- a/CLChillPersonBundle.php
+++ b/CLChillPersonBundle.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace CL\Chill\PersonBundle;
+namespace Chill\PersonBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class CLChillPersonBundle extends Bundle
+class ChillPersonBundle extends Bundle
 {
 }
diff --git a/Controller/AdminController.php b/Controller/AdminController.php
index cd45a421c..b0cb638a9 100644
--- a/Controller/AdminController.php
+++ b/Controller/AdminController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Controller;
+namespace Chill\PersonBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
diff --git a/Controller/HistoryController.php b/Controller/HistoryController.php
index 384b95bf4..0dabef2eb 100644
--- a/Controller/HistoryController.php
+++ b/Controller/HistoryController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Controller;
+namespace Chill\PersonBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use CL\Chill\PersonBundle\Entity\Person;
-use CL\Chill\PersonBundle\Form\PersonHistoryFileType;
-use CL\Chill\PersonBundle\Entity\PersonHistoryFile;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\PersonHistoryFileType;
+use Chill\PersonBundle\Entity\PersonHistoryFile;
 
 class HistoryController extends Controller
 {
@@ -17,7 +17,7 @@ class HistoryController extends Controller
             return $this->createNotFoundException('Person not found');
         }
         
-        return $this->render('CLChillPersonBundle:History:list.html.twig', 
+        return $this->render('ChillPersonBundle:History:list.html.twig', 
                 array('histories' => $person->getHistoriesOrdered(),
                     'person' => $person));
         
@@ -76,7 +76,7 @@ class HistoryController extends Controller
         
         
         
-        return $this->render('CLChillPersonBundle:History:update.html.twig', 
+        return $this->render('ChillPersonBundle:History:update.html.twig', 
                 array('form' => $form->createView(),
                     'person' => $person ) );
     }
@@ -84,7 +84,7 @@ class HistoryController extends Controller
     public function updateAction($id, $historyId){
         $em = $this->getDoctrine()->getManager();
         
-        $history = $em->getRepository('CLChillPersonBundle:PersonHistoryFile')
+        $history = $em->getRepository('ChillPersonBundle:PersonHistoryFile')
                 ->find($historyId);
         
         if ($history === null) {
@@ -147,7 +147,7 @@ class HistoryController extends Controller
         
         
         
-        return $this->render('CLChillPersonBundle:History:update.html.twig', 
+        return $this->render('ChillPersonBundle:History:update.html.twig', 
                 array('form' => $form->createView(),
                     'person' => $person ) );
     }
@@ -250,7 +250,7 @@ class HistoryController extends Controller
         
         
         
-        return $this->render('CLChillPersonBundle:History:close.html.twig',
+        return $this->render('ChillPersonBundle:History:close.html.twig',
                 array(
                     'form' => $form->createView(),
                     'person' => $person,
@@ -260,7 +260,7 @@ class HistoryController extends Controller
     
     /**
      * 
-     * @param CL\Chill\PersonBundle\Entity\Person $person
+     * @param Chill\PersonBundle\Entity\Person $person
      * @return \Symfony\Component\Validator\ConstraintViolationListInterface
      */
     private function _validatePerson(Person $person) {
@@ -302,7 +302,7 @@ class HistoryController extends Controller
         
         if ($historyId !== null) {
             $history = $this->getDoctrine()->getEntityManager()
-                    ->getRepository('CLChillPersonBundle:PersonHistoryFile')
+                    ->getRepository('ChillPersonBundle:PersonHistoryFile')
                 ->find($historyId);
             
         } else {
@@ -387,7 +387,7 @@ class HistoryController extends Controller
         
         
         
-        return $this->render('CLChillPersonBundle:History:open.html.twig',
+        return $this->render('ChillPersonBundle:History:open.html.twig',
                 array(
                     'form' => $form->createView(),
                     'person' => $person,
@@ -411,7 +411,7 @@ class HistoryController extends Controller
     
     private function _getPerson($id) {
         return $this->getDoctrine()->getManager()
-                ->getRepository('CLChillPersonBundle:Person')
+                ->getRepository('ChillPersonBundle:Person')
                 ->find($id);
     }
 
diff --git a/Controller/PersonController.php b/Controller/PersonController.php
index c5474e2e7..10f0e6ef2 100644
--- a/Controller/PersonController.php
+++ b/Controller/PersonController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Controller;
+namespace Chill\PersonBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use CL\Chill\PersonBundle\Entity\Person;
-use CL\Chill\PersonBundle\Form\PersonType;
-use CL\Chill\PersonBundle\Form\CreationPersonType;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\PersonType;
+use Chill\PersonBundle\Form\CreationPersonType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -19,7 +19,7 @@ class PersonController extends Controller {
             return $this->createNotFoundException("Person with id $id not found on this server");
         }
         
-        return $this->render('CLChillPersonBundle:Person:view.html.twig',
+        return $this->render('ChillPersonBundle:Person:view.html.twig',
                 array("person" => $person)
                 );
         
@@ -40,7 +40,7 @@ class PersonController extends Controller {
                 
         
         
-        return $this->render('CLChillPersonBundle:Person:edit.html.twig', 
+        return $this->render('ChillPersonBundle:Person:edit.html.twig', 
                 array('person' => $person, 
                     'form' => $form->createView()));
     }
@@ -64,7 +64,7 @@ class PersonController extends Controller {
                 $this->get('session')
                         ->getFlashBag()->add('danger', 'error' . $errors);
                 
-                return $this->render('CLChillPersonBundle:Person:edit.html.twig', 
+                return $this->render('ChillPersonBundle:Person:edit.html.twig', 
                         array('person' => $person, 
                             'form' => $form->createView()));
             }
@@ -103,7 +103,7 @@ class PersonController extends Controller {
         $offset = $this->getRequest()->query->getInt('offet', 0);
         $limit = $this->getRequest()->query->getInt('limit', 30);
         
-        $dql = 'SELECT p FROM CLChillPersonBundle:Person p'
+        $dql = 'SELECT p FROM ChillPersonBundle:Person p'
                 . ' WHERE'
                 . ' LOWER(p.name) like LOWER(:q)'
                 . ' OR LOWER(p.surname)  like LOWER(:q)';
@@ -135,7 +135,7 @@ class PersonController extends Controller {
                             );
         }
         
-        return $this->render('CLChillPersonBundle:Person:list.html.twig', 
+        return $this->render('ChillPersonBundle:Person:list.html.twig', 
                 array( 
                     'persons' => $persons,
                     'pattern' => $q
@@ -154,7 +154,7 @@ class PersonController extends Controller {
     }
     
     private function _renderNewForm($form) {
-        return $this->render('CLChillPersonBundle:Person:create.html.twig', 
+        return $this->render('ChillPersonBundle:Person:create.html.twig', 
                 array(
                     'form' => $form->createView()
                 ));
@@ -163,7 +163,7 @@ class PersonController extends Controller {
     /**
      * 
      * @param type $form
-     * @return \CL\Chill\PersonBundle\Entity\Person
+     * @return \Chill\PersonBundle\Entity\Person
      */
     private function _bindCreationForm($form) {
         $date = new \DateTime();
@@ -183,7 +183,7 @@ class PersonController extends Controller {
     
     /**
      * 
-     * @param \CL\Chill\PersonBundle\Entity\Person $person
+     * @param \Chill\PersonBundle\Entity\Person $person
      * @return \Symfony\Component\Validator\ConstraintViolationListInterface
      */
     private function _validatePersonAndHistory(Person $person) {
@@ -253,7 +253,7 @@ class PersonController extends Controller {
         
         $query = $em->createQuery();
                 
-        $dql = 'SELECT p from CLChillPersonBundle:Person p WHERE '
+        $dql = 'SELECT p from ChillPersonBundle:Person p WHERE '
                 . 'LOWER(p.name) LIKE LOWER(:name)'
                 . ' OR LOWER(p.surname) LIKE LOWER(:surname)';
 
@@ -270,7 +270,7 @@ class PersonController extends Controller {
         $alternatePersons = $query->getResult();
 
         if (count($alternatePersons) === 0) {
-            return $this->forward('CLChillPersonBundle:Person:create');
+            return $this->forward('ChillPersonBundle:Person:create');
         }
         
         $this->get('session')->getFlashBag()->add('info', 
@@ -279,7 +279,7 @@ class PersonController extends Controller {
                         array('%nb%' => count($alternatePersons)))
                 );
         
-        return $this->render('CLChillPersonBundle:Person:create_review.html.twig',
+        return $this->render('ChillPersonBundle:Person:create_review.html.twig',
                 array('alternatePersons' => $alternatePersons,
                     'name' => $form['name']->getData(),
                     'surname' => $form['surname']->getData(),
@@ -328,12 +328,12 @@ class PersonController extends Controller {
     
     /**
      * easy getting a person by his id
-     * @return \CL\Chill\PersonBundle\Entity\Person
+     * @return \Chill\PersonBundle\Entity\Person
      */
     private function _getPerson($id) {
         $em = $this->getDoctrine()->getManager();
         
-        $person = $em->getRepository('CLChillPersonBundle:Person')
+        $person = $em->getRepository('ChillPersonBundle:Person')
                 ->find($id);
         
         return $person;
diff --git a/DataFixtures/ORM/LoadPeople.php b/DataFixtures/ORM/LoadPeople.php
index 198239351..73e204cb2 100644
--- a/DataFixtures/ORM/LoadPeople.php
+++ b/DataFixtures/ORM/LoadPeople.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace CL\Chill\PersonBundle\DataFixtures\ORM;
+namespace Chill\PersonBundle\DataFixtures\ORM;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
-use CL\Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person;
 
 /**
  * Load people into database
diff --git a/DependencyInjection/CLChillPersonExtension.php b/DependencyInjection/CLChillPersonExtension.php
index a21faa47f..b5dab6047 100644
--- a/DependencyInjection/CLChillPersonExtension.php
+++ b/DependencyInjection/CLChillPersonExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CL\Chill\PersonBundle\DependencyInjection;
+namespace Chill\PersonBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 67776958b..d92d0cfbe 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CL\Chill\PersonBundle\DependencyInjection;
+namespace Chill\PersonBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
diff --git a/Entity/Person.php b/Entity/Person.php
index dd61fa06d..d72a180fb 100644
--- a/Entity/Person.php
+++ b/Entity/Person.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Entity;
+namespace Chill\PersonBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\ExecutionContextInterface;
@@ -141,7 +141,7 @@ ou une valeur vide lorsque la donnée nest pas connue*/
     
     /**
      * 
-     * @param \CL\Chill\PersonBundle\Entity\PersonHistoryFile $history
+     * @param \Chill\PersonBundle\Entity\PersonHistoryFile $history
      * @uses PersonHistoryFile::setPerson
      */
     public function addHistoryFile(PersonHistoryFile $history) {
diff --git a/Entity/PersonHistoryFile.php b/Entity/PersonHistoryFile.php
index ee3b25c60..2f0c07076 100644
--- a/Entity/PersonHistoryFile.php
+++ b/Entity/PersonHistoryFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Entity;
+namespace Chill\PersonBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\ExecutionContextInterface;
@@ -36,7 +36,7 @@ class PersonHistoryFile
     private $memo = '';
 
     /**
-     * @var \CL\Chill\PersonBundle\Entity\Person
+     * @var \Chill\PersonBundle\Entity\Person
      */
     private $person;
     
@@ -176,11 +176,11 @@ class PersonHistoryFile
      * 
      * For consistency, you should use Person::addHistoryFile instead.
      *
-     * @param \CL\Chill\PersonBundle\Entity\Person $person
+     * @param \Chill\PersonBundle\Entity\Person $person
      * @return PersonHistoryFile
      * @see Person::addHistoryFile
      */
-    public function setPerson(\CL\Chill\PersonBundle\Entity\Person $person = null)
+    public function setPerson(\Chill\PersonBundle\Entity\Person $person = null)
     {
         $this->person = $person;
     
@@ -190,7 +190,7 @@ class PersonHistoryFile
     /**
      * Get person
      *
-     * @return \CL\Chill\PersonBundle\Entity\Person 
+     * @return \Chill\PersonBundle\Entity\Person 
      */
     public function getPerson()
     {
diff --git a/Entity/PersonRepository.php b/Entity/PersonRepository.php
index b35740c72..6d1b86f0b 100644
--- a/Entity/PersonRepository.php
+++ b/Entity/PersonRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Entity;
+namespace Chill\PersonBundle\Entity;
 
 use Doctrine\ORM\EntityRepository;
 
diff --git a/Form/CreationPersonType.php b/Form/CreationPersonType.php
index b41bb1473..1f7c26476 100644
--- a/Form/CreationPersonType.php
+++ b/Form/CreationPersonType.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Form;
+namespace Chill\PersonBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use CL\Chill\PersonBundle\Form\Type\CivilType;
-use CL\Chill\PersonBundle\Form\Type\GenderType;
+use Chill\PersonBundle\Form\Type\CivilType;
+use Chill\PersonBundle\Form\Type\GenderType;
 use CL\BelgianNationalNumberBundle\Form\BelgianNationalNumberType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
 
@@ -75,7 +75,7 @@ class CreationPersonType extends AbstractType
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
 //        $resolver->setDefaults(array(
-//            'data_class' => 'CL\Chill\PersonBundle\Entity\Person'
+//            'data_class' => 'Chill\PersonBundle\Entity\Person'
 //        ));
     }
 
diff --git a/Form/DataTransformer/PersonToIdTransformer.php b/Form/DataTransformer/PersonToIdTransformer.php
index 102c2b690..fa1b9916e 100644
--- a/Form/DataTransformer/PersonToIdTransformer.php
+++ b/Form/DataTransformer/PersonToIdTransformer.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Form\DataTransformer;
+namespace Chill\PersonBundle\Form\DataTransformer;
 
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Doctrine\Common\Persistence\ObjectManager;
-use CL\Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person;
 
 class PersonToIdTransformer implements DataTransformerInterface
 {
@@ -53,7 +53,7 @@ class PersonToIdTransformer implements DataTransformerInterface
         }
 
         $issue = $this->om
-            ->getRepository('CLChillPersonBundle:Person')
+            ->getRepository('ChillPersonBundle:Person')
             ->findOneBy(array('id' => $id))
         ;
 
diff --git a/Form/PersonHistoryFileType.php b/Form/PersonHistoryFileType.php
index 069a414f4..e01eb539f 100644
--- a/Form/PersonHistoryFileType.php
+++ b/Form/PersonHistoryFileType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Form;
+namespace Chill\PersonBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -44,7 +44,7 @@ class PersonHistoryFileType extends AbstractType
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
-            'data_class' => 'CL\Chill\PersonBundle\Entity\PersonHistoryFile'
+            'data_class' => 'Chill\PersonBundle\Entity\PersonHistoryFile'
         ));
     }
 
diff --git a/Form/PersonType.php b/Form/PersonType.php
index 53dce6639..3860ce811 100644
--- a/Form/PersonType.php
+++ b/Form/PersonType.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Form;
+namespace Chill\PersonBundle\Form;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use CL\Chill\PersonBundle\Form\Type\CivilType;
-use CL\Chill\PersonBundle\Form\Type\GenderType;
+use Chill\PersonBundle\Form\Type\CivilType;
+use Chill\PersonBundle\Form\Type\GenderType;
 use CL\BelgianNationalNumberBundle\Form\BelgianNationalNumberType;
 
 class PersonType extends AbstractType
@@ -51,7 +51,7 @@ class PersonType extends AbstractType
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(array(
-            'data_class' => 'CL\Chill\PersonBundle\Entity\Person'
+            'data_class' => 'Chill\PersonBundle\Entity\Person'
         ));
     }
 
diff --git a/Form/Type/CivilType.php b/Form/Type/CivilType.php
index ffcd5937f..5186cf7d4 100644
--- a/Form/Type/CivilType.php
+++ b/Form/Type/CivilType.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Form\Type;
+namespace Chill\PersonBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use CL\Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person;
 
 /**
  * A type to select the civil union state
diff --git a/Form/Type/GenderType.php b/Form/Type/GenderType.php
index 45c081816..7b8874021 100644
--- a/Form/Type/GenderType.php
+++ b/Form/Type/GenderType.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Form\Type;
+namespace Chill\PersonBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
-use CL\Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person;
 
 /**
  * A type to select the civil union state
diff --git a/Resources/config/doctrine/Person.orm.yml b/Resources/config/doctrine/Person.orm.yml
index 7e0e82756..cba029080 100644
--- a/Resources/config/doctrine/Person.orm.yml
+++ b/Resources/config/doctrine/Person.orm.yml
@@ -1,7 +1,7 @@
-CL\Chill\PersonBundle\Entity\Person:
+Chill\PersonBundle\Entity\Person:
     type: entity
     table: null
-    repositoryClass: CL\Chill\PersonBundle\Entity\PersonRepository
+    repositoryClass: Chill\PersonBundle\Entity\PersonRepository
     fields:
         id:
             type: integer
diff --git a/Resources/config/doctrine/PersonHistoryFile.orm.yml b/Resources/config/doctrine/PersonHistoryFile.orm.yml
index f3ea0e6e8..358dadf25 100644
--- a/Resources/config/doctrine/PersonHistoryFile.orm.yml
+++ b/Resources/config/doctrine/PersonHistoryFile.orm.yml
@@ -1,4 +1,4 @@
-CL\Chill\PersonBundle\Entity\PersonHistoryFile:
+Chill\PersonBundle\Entity\PersonHistoryFile:
     type: entity
     table: person_history_file
     id:
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index c4f4349be..2707fb00a 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -2,7 +2,7 @@
 
 chill_person_view:
     pattern: /view/{id}
-    defaults: { _controller: CLChillPersonBundle:Person:view }
+    defaults: { _controller: ChillPersonBundle:Person:view }
     options:
         menu: person
         order: 50
@@ -10,32 +10,32 @@ chill_person_view:
         
 chill_person_general_edit:
     pattern: /view/{id}/edit
-    defaults: {_controller: CLChillPersonBundle:Person:edit }
+    defaults: {_controller: ChillPersonBundle:Person:edit }
     
 chill_person_general_update:
     pattern: /view/{id}/update
-    defaults: {_controller: CLChillPersonBundle:Person:update }
+    defaults: {_controller: ChillPersonBundle:Person:update }
     
 chill_person_new:
     pattern: /new
-    defaults: {_controller: CLChillPersonBundle:Person:new }
+    defaults: {_controller: ChillPersonBundle:Person:new }
     
 chill_person_review:
     pattern: /review
-    defaults: {_controller: CLChillPersonBundle:Person:review }
+    defaults: {_controller: ChillPersonBundle:Person:review }
     
 chill_person_create:
     pattern: /create
-    defaults: {_controller: CLChillPersonBundle:Person:create }
+    defaults: {_controller: ChillPersonBundle:Person:create }
     
     
 chill_person_search:
     pattern: /search
-    defaults: { _controller: CLChillPersonBundle:Person:search }      
+    defaults: { _controller: ChillPersonBundle:Person:search }      
         
 chill_person_history_list:
     pattern: /{id}/history
-    defaults: { _controller: CLChillPersonBundle:History:list }
+    defaults: { _controller: ChillPersonBundle:History:list }
     options:
         menu: person
         order: 100
@@ -43,24 +43,24 @@ chill_person_history_list:
         
 chill_person_history_create:
     pattern: /{personId}/history/create
-    defaults: { _controller: CLChillPersonBundle:History:create }
+    defaults: { _controller: ChillPersonBundle:History:create }
     
 
 chill_person_history_update:
     pattern: /{id}/history/{historyId}/update
-    defaults: { _controller: CLChillPersonBundle:History:update }   
+    defaults: { _controller: ChillPersonBundle:History:update }   
     
 chill_person_history_close:
     pattern: /{id}/history/close
-    defaults: { _controller: CLChillPersonBundle:History:close }
+    defaults: { _controller: ChillPersonBundle:History:close }
     
 chill_person_history_open:
     pattern: /{id}/history/open
-    defaults: { _controller: CLChillPersonBundle:History:open }
+    defaults: { _controller: ChillPersonBundle:History:open }
     
 chill_person_admin:
     pattern: /admin
-    defaults: { _controller: CLChillPersonBundle:Admin:index }
+    defaults: { _controller: ChillPersonBundle:Admin:index }
     options:
         menu: admin
         order: 100
@@ -70,7 +70,7 @@ chill_person_admin:
 #sample admin_person menu:
 chill_person_admin_test_one:
     pattern: /admin/test_one
-    defaults: { _controller: CLChillPersonBundle:Admin:test }
+    defaults: { _controller: ChillPersonBundle:Admin:test }
     options:
         menu: admin_person
         order: 100
@@ -80,7 +80,7 @@ chill_person_admin_test_one:
 #sample
 chill_appointment_list:
     pattern: /view/{id}/appointment/list
-    defaults: {_controller: CLChillPersonBundle:Person:view}
+    defaults: {_controller: ChillPersonBundle:Person:view}
     options:
         menu: person
         order: 200
@@ -88,7 +88,7 @@ chill_appointment_list:
         
 chill_prof_status_view:
     pattern: /view/{id}/prof/list
-    defaults: {_controller: CLChillPersonBundle:Person:view}
+    defaults: {_controller: ChillPersonBundle:Person:view}
     options:
         menu: person
         order: 300
@@ -96,7 +96,7 @@ chill_prof_status_view:
         
 chill_admin_view:
     pattern: /view/{id}/administrative
-    defaults: {_controller: CLChillPersonBundle:Person:view}
+    defaults: {_controller: ChillPersonBundle:Person:view}
     options:
         menu: person
         order: 400
@@ -104,7 +104,7 @@ chill_admin_view:
         
 chill_language:
     pattern: /view/{id}/language/list
-    defaults: {_controller: CLChillPersonBundle:Person:view}
+    defaults: {_controller: ChillPersonBundle:Person:view}
     options:
         menu: person
         order: 500
@@ -112,7 +112,7 @@ chill_language:
         
 chill_studies:
     pattern: /view/{id}/studies
-    defaults: {_controller: CLChillPersonBundle:Person:view}
+    defaults: {_controller: ChillPersonBundle:Person:view}
     options:
         menu: person
         order: 600
@@ -120,7 +120,7 @@ chill_studies:
         
 chill_notes:
     pattern: /view/{id}/notes
-    defaults: {_controller: CLChillPersonBundle:Person:view}
+    defaults: {_controller: ChillPersonBundle:Person:view}
     options:
         menu: person
         order: 700
@@ -128,7 +128,7 @@ chill_notes:
         
 chill_docs:
     pattern: /view/{id}/docs
-    defaults: {_controller: CLChillPersonBundle:Person:view}
+    defaults: {_controller: ChillPersonBundle:Person:view}
     options:
         menu: person
         order: 800
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 414e3f911..f0c0a1579 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -1,5 +1,5 @@
 parameters:
-#    cl_chill_person.example.class: CL\Chill\PersonBundle\Example
+#    cl_chill_person.example.class: Chill\PersonBundle\Example
 
 services:
 #    cl_chill_person.example:
diff --git a/Resources/config/validation.yml b/Resources/config/validation.yml
index 32c788e54..e4ff22459 100644
--- a/Resources/config/validation.yml
+++ b/Resources/config/validation.yml
@@ -1,4 +1,4 @@
-CL\Chill\PersonBundle\Entity\Person:
+Chill\PersonBundle\Entity\Person:
     properties:
         belgian_national_number:
               - NotBlank: 
@@ -46,7 +46,7 @@ CL\Chill\PersonBundle\Entity\Person:
                   
                   
 
-CL\Chill\PersonBundle\Entity\PersonHistoryFile:
+Chill\PersonBundle\Entity\PersonHistoryFile:
     properties:
         date_opening:
               - Date: 
diff --git a/Resources/views/History/close.html.twig b/Resources/views/History/close.html.twig
index c1c9c92df..5bef4c7bc 100644
--- a/Resources/views/History/close.html.twig
+++ b/Resources/views/History/close.html.twig
@@ -1,4 +1,4 @@
-{% extends "CLChillPersonBundle::layout.html.twig"  %}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
 
 {% set activeRouteKey = null %}
 
diff --git a/Resources/views/History/list.html.twig b/Resources/views/History/list.html.twig
index ab9a94f80..d4665a784 100644
--- a/Resources/views/History/list.html.twig
+++ b/Resources/views/History/list.html.twig
@@ -1,4 +1,4 @@
-{% extends "CLChillPersonBundle::layout.html.twig"  %}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_history_list' %}
 
diff --git a/Resources/views/History/open.html.twig b/Resources/views/History/open.html.twig
index 9c0e90bb9..0e176001a 100644
--- a/Resources/views/History/open.html.twig
+++ b/Resources/views/History/open.html.twig
@@ -1,4 +1,4 @@
-{% extends "CLChillPersonBundle::layout.html.twig"  %}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
 
 {% set activeRouteKey = null %}
 
diff --git a/Resources/views/History/update.html.twig b/Resources/views/History/update.html.twig
index cc972fdd8..03ae338e3 100644
--- a/Resources/views/History/update.html.twig
+++ b/Resources/views/History/update.html.twig
@@ -1,4 +1,4 @@
-{% extends "CLChillPersonBundle::layout.html.twig"  %}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
 
 {% set activeRouteKey = null %}
 
diff --git a/Resources/views/Person/edit.html.twig b/Resources/views/Person/edit.html.twig
index 614e3cfb3..d99488d41 100644
--- a/Resources/views/Person/edit.html.twig
+++ b/Resources/views/Person/edit.html.twig
@@ -1,15 +1,15 @@
-{% extends "CLChillPersonBundle::layout.html.twig"  %}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
 
 {% set activeRouteKey = '' %}
 
-{% block title %}CLChillPersonBundle:Person:see{% endblock %}
+{% block title %}ChillPersonBundle:Person:see{% endblock %}
 
 {% block personcontent %}
 
 {% form_theme form 'CLChillMainBundle:Form:fields.html.twig' %}
 
 {{ form_start(form) }}
-{% set include_temp = 'CLChillPersonBundle:Form:form_control.html.twig' %}
+{% set include_temp = 'ChillPersonBundle:Form:form_control.html.twig' %}
 {% set include_args = {'return_key': 'chill_person_view', 
        'return_args' : { 'id' : person.id} } %}
 {{ include(include_temp, include_args) }} 
diff --git a/Resources/views/Person/view.html.twig b/Resources/views/Person/view.html.twig
index 5eccecc6c..36a1e49bb 100644
--- a/Resources/views/Person/view.html.twig
+++ b/Resources/views/Person/view.html.twig
@@ -1,4 +1,4 @@
-{% extends "CLChillPersonBundle::layout.html.twig"  %}
+{% extends "ChillPersonBundle::layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_person_view' %}
 
@@ -10,9 +10,9 @@ This view should receive those arguments:
 
 #}
 
-{% block title %}CLChillPersonBundle:Person:see{% endblock %}
+{% block title %}ChillPersonBundle:Person:see{% endblock %}
 
-{% set edit_tmp_name = 'CLChillPersonBundle:Form:go_to_form.html.twig'  %}
+{% set edit_tmp_name = 'ChillPersonBundle:Form:go_to_form.html.twig'  %}
 {% set edit_tmp_args = { 'form_path_args' : { 'id': person.id }, 
       'form_path_key' : 'chill_person_general_edit' } %}
 
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index b0c5a09c6..9c512e466 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -47,7 +47,7 @@
      {# Note: activeRouteKey should be defined in Controller or child layout #}       
         {{ render(controller("CLChillMainBundle:Menu:writeMenu", {
              'menu' : 'person',
-             'layout': 'CLChillPersonBundle::menu.html.twig',
+             'layout': 'ChillPersonBundle::menu.html.twig',
              'args' : {'id': person.id },
              'activeRouteKey': activeRouteKey
         })) }}
diff --git a/Tests/Controller/DefaultControllerTest.php b/Tests/Controller/DefaultControllerTest.php
index cb222c803..353c6119a 100644
--- a/Tests/Controller/DefaultControllerTest.php
+++ b/Tests/Controller/DefaultControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Tests\Controller;
+namespace Chill\PersonBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
diff --git a/Tests/Controller/HistoryControllerTest.php b/Tests/Controller/HistoryControllerTest.php
index dfd52c363..32d401b31 100644
--- a/Tests/Controller/HistoryControllerTest.php
+++ b/Tests/Controller/HistoryControllerTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Tests\Controller;
+namespace Chill\PersonBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use CL\Chill\PersonBundle\Entity\PersonHistoryFile;
-use CL\Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\PersonHistoryFile;
+use Chill\PersonBundle\Entity\Person;
 
 class HistoryControllerTest extends WebTestCase
 {
diff --git a/Tests/Controller/PersonControllerTest.php b/Tests/Controller/PersonControllerTest.php
index 054b6e262..b914270ac 100644
--- a/Tests/Controller/PersonControllerTest.php
+++ b/Tests/Controller/PersonControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CL\Chill\PersonBundle\Tests\Controller;
+namespace Chill\PersonBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;