diff --git a/README.md b/README.md
index 781ed25..adec9cc 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ The recommanded way to install this bundle is through [Composer](http://getcompo
 * Add eZObjectWrapperBundle into EzPublishKernel.php: 
 
 ```php
-new \eZObject\WrapperBundle\eZObjectWrapperBundle()
+new \Kaliop\eZObjectWrapperBundle\eZObjectWrapperBundle()
 ```
 
 ## Usage
diff --git a/WrapperBundle/Core/Exception/BadParameters.php b/WrapperBundle/Core/Exception/BadParameters.php
index ad39bbb..6242d37 100644
--- a/WrapperBundle/Core/Exception/BadParameters.php
+++ b/WrapperBundle/Core/Exception/BadParameters.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace eZObject\WrapperBundle\Core\Exception;
+namespace Kaliop\eZObjectWrapperBundle\Core\Exception;
 
 use Exception;
 
diff --git a/WrapperBundle/Core/eZObjectWrapper.php b/WrapperBundle/Core/eZObjectWrapper.php
index f56db08..cf773a8 100644
--- a/WrapperBundle/Core/eZObjectWrapper.php
+++ b/WrapperBundle/Core/eZObjectWrapper.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace eZObject\WrapperBundle\Core;
+namespace Kaliop\eZObjectWrapperBundle\Core;
 
 use eZ\Publish\API\Repository\Values\Content\Content;
 use eZ\Publish\API\Repository\Values\Content\Location;
-use eZObject\WrapperBundle\Core\Exception\BadParameters;
+use Kaliop\eZObjectWrapperBundle\Core\Exception\BadParameters;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * An entity is an object with a location and his content, available in lazy loading.
  * Class kEntity
- * @package ezobject\WrapperBundle\Core
+ * @package Kaliop\eZObjectWrapperBundle\Core
  */
 class eZObjectWrapper implements eZObjectWrapperInterface, ContainerAwareInterface
 {
diff --git a/WrapperBundle/Core/eZObjectWrapperFactory.php b/WrapperBundle/Core/eZObjectWrapperFactory.php
index 3fce495..e922946 100644
--- a/WrapperBundle/Core/eZObjectWrapperFactory.php
+++ b/WrapperBundle/Core/eZObjectWrapperFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace eZObject\WrapperBundle\Core;
+namespace Kaliop\eZObjectWrapperBundle\Core;
 
 use eZ\Publish\API\Repository\Values\Content\Content;
 use eZ\Publish\API\Repository\Values\Content\Location;
@@ -10,7 +10,7 @@
 /**
  * Factory which provide eZObjectWrapper objects or eZObjectWrapper children objects, according to parameters sets in eZObjectWrapper.yaml
  * Class eZObjectWrapperFactory
- * @package ezobject\WrapperBundle\Core
+ * @package Kaliop\eZObjectWrapperBundle\Core
  */
 class eZObjectWrapperFactory
 {
@@ -37,7 +37,7 @@ public function __construct(ContainerInterface $container)
     /**
      * Create a eZObjectWrapper object, or a child class of eZObjectWrapper, according to parameters set in eZObjectWrapper.yml
      * @param $source integer|Location|Content
-     * @return \eZObject\WrapperBundle\Core\eZObjectWrapper
+     * @return \Kaliop\eZObjectWrapperBundle\Core\eZObjectWrapper
      */
     public function buildeZObjectWrapper($source)
     {
diff --git a/WrapperBundle/Core/eZObjectWrapperInterface.php b/WrapperBundle/Core/eZObjectWrapperInterface.php
index 13c0cda..9410a60 100644
--- a/WrapperBundle/Core/eZObjectWrapperInterface.php
+++ b/WrapperBundle/Core/eZObjectWrapperInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace eZObject\WrapperBundle\Core;
+namespace Kaliop\eZObjectWrapperBundle\Core;
 
 interface eZObjectWrapperInterface
 {
diff --git a/WrapperBundle/DependencyInjection/Configuration.php b/WrapperBundle/DependencyInjection/Configuration.php
index 8677235..a6953ab 100644
--- a/WrapperBundle/DependencyInjection/Configuration.php
+++ b/WrapperBundle/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace eZObject\WrapperBundle\DependencyInjection;
+namespace Kaliop\eZObjectWrapperBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -20,7 +20,7 @@ public function getConfigTreeBuilder()
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('e_z_object_wrapper');
 
-        // TODO => semeantic configuration
+        // TODO => semantic configuration
 //        $rootNode
 //            ->children()
 //                ->arrayNode('class_mapping')->end()
diff --git a/WrapperBundle/DependencyInjection/eZObjectWrapperExtension.php b/WrapperBundle/DependencyInjection/KaliopeZObjectWrapperExtension.php
similarity index 86%
rename from WrapperBundle/DependencyInjection/eZObjectWrapperExtension.php
rename to WrapperBundle/DependencyInjection/KaliopeZObjectWrapperExtension.php
index aa16b68..498764e 100644
--- a/WrapperBundle/DependencyInjection/eZObjectWrapperExtension.php
+++ b/WrapperBundle/DependencyInjection/KaliopeZObjectWrapperExtension.php
@@ -1,29 +1,29 @@
-<?php
-
-namespace eZObject\WrapperBundle\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
-
-/**
- * This is the class that loads and manages your bundle configuration
- *
- * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
- */
-class eZObjectWrapperExtension extends Extension
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
-        $loader->load('eZObjectWrapper.yml');
-    }
-}
+<?php
+
+namespace Kaliop\eZObjectWrapperBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+
+/**
+ * This is the class that loads and manages your bundle configuration
+ *
+ * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
+ */
+class KaliopeZObjectWrapperExtension extends Extension
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.yml');
+        $loader->load('eZObjectWrapper.yml');
+    }
+}
diff --git a/WrapperBundle/KaliopeZObjectWrapperBundle.php b/WrapperBundle/KaliopeZObjectWrapperBundle.php
new file mode 100644
index 0000000..8256b5c
--- /dev/null
+++ b/WrapperBundle/KaliopeZObjectWrapperBundle.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Kaliop\eZObjectWrapperBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class KaliopeZObjectWrapperBundle extends Bundle
+{
+}
diff --git a/WrapperBundle/Resources/config/eZObjectWrapper.yml b/WrapperBundle/Resources/config/eZObjectWrapper.yml
index 83c9c63..993effc 100644
--- a/WrapperBundle/Resources/config/eZObjectWrapper.yml
+++ b/WrapperBundle/Resources/config/eZObjectWrapper.yml
@@ -1,4 +1,4 @@
 parameters:
-    default_ezobject_class: ezobject\WrapperBundle\Core\eZObjectWrapper
+    default_ezobject_class: Kaliop\eZObjectWrapperBundle\Core\eZObjectWrapper
 #    class_mapping:
 #            article: \Acme\AcmeBundle\eZObjectWrapper\Article
\ No newline at end of file
diff --git a/WrapperBundle/Resources/config/services.yml b/WrapperBundle/Resources/config/services.yml
index b38f5fb..03f04a0 100644
--- a/WrapperBundle/Resources/config/services.yml
+++ b/WrapperBundle/Resources/config/services.yml
@@ -1,12 +1,12 @@
 parameters:
-    ezobject_wrapper.ezobject_wrapper_factory.class: eZObject\WrapperBundle\Core\eZObjectWrapperFactory
+    ezobject_wrapper.ezobject_wrapper_factory.class: Kaliop\Kaliop\eZObjectWrapperBundle\Core\eZObjectWrapperFactory
 
 services:
     ezobject_wrapper.services.factory:
         class: %ezobject_wrapper.ezobject_wrapper_factory.class%
         arguments: [@service_container]
     twig.extension.eZObjectWrapper:
-        class: eZObject\WrapperBundle\Twig\eZObjectWrapperExtension
+        class: Kaliop\eZObjectWrapperBundle\Twig\eZObjectWrapperExtension
         arguments: [@service_container]
         tags:
             - { name: twig.extension }
\ No newline at end of file
diff --git a/WrapperBundle/Twig/eZObjectWrapperExtension.php b/WrapperBundle/Twig/eZObjectWrapperExtension.php
index bb5176b..3bd2289 100644
--- a/WrapperBundle/Twig/eZObjectWrapperExtension.php
+++ b/WrapperBundle/Twig/eZObjectWrapperExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace eZObject\WrapperBundle\Twig;
+namespace Kaliop\eZObjectWrapperBundle\Twig;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/WrapperBundle/eZObjectWrapperBundle.php b/WrapperBundle/eZObjectWrapperBundle.php
deleted file mode 100644
index cd19087..0000000
--- a/WrapperBundle/eZObjectWrapperBundle.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace eZObject\WrapperBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class eZObjectWrapperBundle extends Bundle
-{
-}
diff --git a/composer.json b/composer.json
index 9502e55..ae79abe 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ezsystems/ezpublish-kernel": ">=5.3|>=2014.03"
     },
     "autoload": {
-        "psr-0": {"eZObject\\WrapperBundle": ""}
+        "psr-4": {"Kaliop\\eZObjectWrapperBundle\\": ""}
     },
     "target-dir": "eZObject"
 }