diff --git a/Command/AbstractCommand.php b/Command/AbstractCommand.php
index 475b3c77..8eaba982 100755
--- a/Command/AbstractCommand.php
+++ b/Command/AbstractCommand.php
@@ -1,25 +1,25 @@
 <?php
-namespace Kaliop\Migration\Command;
+namespace Kaliop\eZMigrationBundle\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Doctrine\DBAL\DriverManager;
-use Kaliop\Migration\Core\Configuration;
+use Kaliop\eZMigrationBundle\Core\Configuration;
 
 /**
  * Class AbstractCommand
  *
  * Base command class that all migration commands extend from.
  *
- * @package Kaliop\Migration\Command
+ * @package Kaliop\eZMigrationBundle\Command
  */
 abstract class AbstractCommand extends Command
 {
     /**
      * The migration configuration object.
      *
-     * @var \Kaliop\Migration\Core\Configuration
+     * @var \Kaliop\eZMigrationBundle\Core\Configuration
      */
     private $configuration;
 
@@ -58,7 +58,7 @@ public function getConfiguration( InputInterface $input, OutputInterface $output
             $configuration->versionDirectory = $container->getParameter( 'kaliop_bundle_migration.version_directory' );
             $configuration->versionTableName = $container->getParameter( 'kaliop_bundle_migration.table_name' );
             $this->configuration = $configuration;
-            
+
         }
 
         return $this->configuration;
diff --git a/Command/GenerateCommand.php b/Command/GenerateCommand.php
index c956f279..30abc5a1 100755
--- a/Command/GenerateCommand.php
+++ b/Command/GenerateCommand.php
@@ -1,8 +1,8 @@
 <?php
-namespace Kaliop\Migration\Command;
 
+namespace Kaliop\eZMigrationBundle\Command;
 
-use Kaliop\Migration\Core\Configuration;
+use Kaliop\eZMigrationBundle\Core\Configuration;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -15,7 +15,7 @@ class GenerateCommand extends AbstractCommand {
 
 namespace <namespace>;
 
-use Kaliop\Migration\Interfaces\VersionInterface;
+use Kaliop\eZMigrationBundle\Interfaces\VersionInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -68,7 +68,7 @@ protected function configure() {
             ->setDescription('Generate a blank migration definition file.')
             ->addOption('type', null, InputOption::VALUE_OPTIONAL, 'The type of migration file to generate. (yml, php, sql)', 'yml')
             ->addOption('dbserver', null, InputOption::VALUE_OPTIONAL, 'The type of the database server the sql migration is for. (mysql, postgre)', 'mysql')
-            ->addArgument('bundle', InputOption::VALUE_REQUIRED, 'The bundle to generate the migration definition file in. eg.: KaliopBundleMigrationBundle' )
+            ->addArgument('bundle', InputOption::VALUE_REQUIRED, 'The bundle to generate the migration definition file in. eg.: AcmeMigrationBundle' )
             ->setHelp(<<<EOT
 The <info>kaliop:migration:generate</info> command generates a skeleton migration definition file:
 
@@ -190,4 +190,4 @@ protected function generateMigrationFile(Configuration $configuration, $version,
 
         return $path;
     }
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/Command/StatusCommand.php b/Command/StatusCommand.php
index d731da84..31ad5a07 100755
--- a/Command/StatusCommand.php
+++ b/Command/StatusCommand.php
@@ -1,7 +1,7 @@
 <?php
-namespace Kaliop\Migration\Command;
+namespace Kaliop\eZMigrationBundle\Command;
 
-use Kaliop\Migration\Command\AbstractCommand;
+use Kaliop\eZMigrationBundle\Command\AbstractCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -11,7 +11,7 @@
  *
  * Command to display the status of migrations.
  *
- * @package Kaliop\Migration\Command
+ * @package Kaliop\eZMigrationBundle\Command
  */
 class StatusCommand extends AbstractCommand
 {
@@ -66,7 +66,7 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         //Check paths for version files
 
-        /* @var $configuration \Kaliop\Migration\Core\Configuration */
+        /* @var $configuration \Kaliop\eZMigrationBundle\Core\Configuration */
         $configuration->registerVersionFromDirectories($paths);
 
         if ($bundleVersions = $configuration->getVersions()) {
@@ -78,7 +78,7 @@ public function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln("<info>{$bundle}</info>:");
 
                 foreach ($versions as $versionNumber => $versionClass) {
-                    /** @var $versionClass \Kaliop\Migration\Core\Version */
+                    /** @var $versionClass \Kaliop\eZMigrationBundle\Core\Version */
                     $isMigrated = array_key_exists($bundle, $migratedVersions) && in_array(
                             $versionNumber,
                             $migratedVersions[$bundle]
diff --git a/Command/UpdateCommand.php b/Command/UpdateCommand.php
index 764f6962..268f00f9 100755
--- a/Command/UpdateCommand.php
+++ b/Command/UpdateCommand.php
@@ -1,8 +1,8 @@
 <?php
-namespace Kaliop\Migration\Command;
+namespace Kaliop\eZMigrationBundle\Command;
 
-use Kaliop\Migration\Command\AbstractCommand;
-use Kaliop\Migration\Core\API\ReferenceHandler;
+use Kaliop\eZMigrationBundle\Command\AbstractCommand;
+use Kaliop\eZMigrationBundle\Core\API\ReferenceHandler;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -14,7 +14,7 @@
  *
  * Command to execute the available migration definitions.
  *
- * @package Kaliop\Migration\Command
+ * @package Kaliop\eZMigrationBundle\Command
  */
 class UpdateCommand extends AbstractCommand
 {
@@ -65,7 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Get paths to look for version files in
         $versions = $input->getOption('versions');
 
-        /** @var $configuration \Kaliop\Migration\Core\Configuration */
+        /** @var $configuration \Kaliop\eZMigrationBundle\Core\Configuration */
         $configuration = $this->getConfiguration($input, $output);
 
         if ($versions) {
@@ -94,7 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
                 if ($versions) {
                     foreach ($versions as $versionNumber => $versionClass) {
-                        /** @var $versionClass \Kaliop\Migration\Core\Version */
+                        /** @var $versionClass \Kaliop\eZMigrationBundle\Core\Version */
                         $output->writeln(
                             "<comment>></comment> " . date(
                                 "Y-m-d H:i:s",
diff --git a/Core/API/Managers/AbstractManager.php b/Core/API/Managers/AbstractManager.php
index 440e51bf..0cee514c 100755
--- a/Core/API/Managers/AbstractManager.php
+++ b/Core/API/Managers/AbstractManager.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Kaliop\Migration\Core\API\Managers;
+namespace Kaliop\eZMigrationBundle\Core\API\Managers;
 
-use Kaliop\Migration\Core\API\ReferenceHandler;
-use Kaliop\Migration\Interfaces\API\ManagerInterface;
-use Kaliop\Migration\Interfaces\BundleAwareInterface;
+use Kaliop\eZMigrationBundle\Core\API\ReferenceHandler;
+use Kaliop\eZMigrationBundle\Interfaces\API\ManagerInterface;
+use Kaliop\eZMigrationBundle\Interfaces\BundleAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
@@ -14,7 +14,7 @@
  *
  * The core manager class that all migration action managers inherit from.
  *
- * @package Kaliop\Migration\Core\API\Managers
+ * @package Kaliop\eZMigrationBundle\Core\API\Managers
  */
 abstract class AbstractManager implements ManagerInterface, ContainerAwareInterface, BundleAwareInterface
 {
diff --git a/Core/API/Managers/ContentManager.php b/Core/API/Managers/ContentManager.php
index 6025e239..7b82a62d 100755
--- a/Core/API/Managers/ContentManager.php
+++ b/Core/API/Managers/ContentManager.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Kaliop\Migration\Core\API\Managers;
+namespace Kaliop\eZMigrationBundle\Core\API\Managers;
 
-use Kaliop\Migration\Core\API\Managers\AbstractManager;
+use Kaliop\eZMigrationBundle\Core\API\Managers\AbstractManager;
 use eZ\Publish\API\Repository\Values\Content\ContentCreateStruct;
 use eZ\Publish\API\Repository\Values\Content\ContentUpdateStruct;
-use Kaliop\Migration\Core\API\ReferenceHandler;
+use Kaliop\eZMigrationBundle\Core\API\ReferenceHandler;
 use eZ\Publish\Core\FieldType\Image\Value as ImageValue;
 use eZ\Publish\Core\FieldType\BinaryFile\Value as BinaryFileValue;
 use eZ\Publish\Core\FieldType\Checkbox\Value as CheckboxValue;
@@ -16,7 +16,7 @@
  * Class implementing the actions for managing (create/update/delete) Content in the system through
  * migrations and abstracts away the eZ Publish Public API.
  *
- * @package Kaliop\Migration\Core\API\Managers
+ * @package Kaliop\eZMigrationBundle\Core\API\Managers
  */
 class ContentManager extends AbstractManager
 {
diff --git a/Core/API/Managers/ContentTypeManager.php b/Core/API/Managers/ContentTypeManager.php
index 045f3eab..066dff7e 100755
--- a/Core/API/Managers/ContentTypeManager.php
+++ b/Core/API/Managers/ContentTypeManager.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Kaliop\Migration\Core\API\Managers;
+namespace Kaliop\eZMigrationBundle\Core\API\Managers;
 
 use eZ\Publish\API\Repository\ContentTypeService;
-use Kaliop\Migration\Core\API\ReferenceHandler;
+use Kaliop\eZMigrationBundle\Core\API\ReferenceHandler;
 
 /**
  * Class ContentTypeManager
  *
  * Methods to handle content type migrations
  *
- * @package Kaliop\Migration\Core\API\Managers
+ * @package Kaliop\eZMigrationBundle\Core\API\Managers
  */
 class ContentTypeManager extends AbstractManager
 {
diff --git a/Core/API/Managers/LocationManager.php b/Core/API/Managers/LocationManager.php
index fe6f33ea..ace7b48b 100755
--- a/Core/API/Managers/LocationManager.php
+++ b/Core/API/Managers/LocationManager.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Kaliop\Migration\Core\API\Managers;
+namespace Kaliop\eZMigrationBundle\Core\API\Managers;
 
 use eZ\Publish\API\Repository\Values\Content\Location;
-use Kaliop\Migration\Core\API\ReferenceHandler;
+use Kaliop\eZMigrationBundle\Core\API\ReferenceHandler;
 
 /**
  * Class LocationManager
- * @package Kaliop\Migration\Core\API\Managers
+ * @package Kaliop\eZMigrationBundle\Core\API\Managers
  */
 class LocationManager extends AbstractManager
 {
diff --git a/Core/API/Managers/RoleManager.php b/Core/API/Managers/RoleManager.php
index 616ad5c3..4f429c55 100755
--- a/Core/API/Managers/RoleManager.php
+++ b/Core/API/Managers/RoleManager.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace Kaliop\Migration\Core\API\Managers;
+namespace Kaliop\eZMigrationBundle\Core\API\Managers;
 
 
 use eZ\Publish\API\Repository\Values\User\Role;
 use eZ\Publish\API\Repository\RoleService;
 use eZ\Publish\API\Repository\UserService;
-use Kaliop\Migration\Core\API\ReferenceHandler;
+use Kaliop\eZMigrationBundle\Core\API\ReferenceHandler;
 
 /**
  * Class RoleManager
  *
  * Handles the role migration definitions.
  *
- * @package Kaliop\Migration\Core\API\Managers
+ * @package Kaliop\eZMigrationBundle\Core\API\Managers
  */
 class RoleManager extends AbstractManager
 {
diff --git a/Core/API/Managers/UserGroupManager.php b/Core/API/Managers/UserGroupManager.php
index 954099a6..2467dc07 100755
--- a/Core/API/Managers/UserGroupManager.php
+++ b/Core/API/Managers/UserGroupManager.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Kaliop\Migration\Core\API\Managers;
+namespace Kaliop\eZMigrationBundle\Core\API\Managers;
 
-use Kaliop\Migration\Core\API\ReferenceHandler;
+use Kaliop\eZMigrationBundle\Core\API\ReferenceHandler;
 use eZ\Publish\API\Repository\Values\User\UserGroup;
 
 /**
@@ -10,7 +10,7 @@
  *
  * Handles user group migrations.
  *
- * @package Kaliop\Migration\Core\API\Managers
+ * @package Kaliop\eZMigrationBundle\Core\API\Managers
  */
 class UserGroupManager extends AbstractManager
 {
diff --git a/Core/API/Managers/UserManager.php b/Core/API/Managers/UserManager.php
index 57739667..f39a537f 100755
--- a/Core/API/Managers/UserManager.php
+++ b/Core/API/Managers/UserManager.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Kaliop\Migration\Core\API\Managers;
+namespace Kaliop\eZMigrationBundle\Core\API\Managers;
 
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
 use eZ\Publish\API\Repository\Values\Content;
-use Kaliop\Migration\Core\API\ReferenceHandler;
+use Kaliop\eZMigrationBundle\Core\API\ReferenceHandler;
 
 /**
  * Class UserManager
  *
  * Handle user migrations.
  *
- * @package Kaliop\Migration\Core\API\Managers
+ * @package Kaliop\eZMigrationBundle\Core\API\Managers
  */
 class UserManager extends AbstractManager
 {
diff --git a/Core/API/ReferenceHandler.php b/Core/API/ReferenceHandler.php
index 53df0936..3087ebb9 100755
--- a/Core/API/ReferenceHandler.php
+++ b/Core/API/ReferenceHandler.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Kaliop\Migration\Core\API;
+namespace Kaliop\eZMigrationBundle\Core\API;
 
 /**
  * Class ReferenceHandler
  *
  * Handle references.
  *
- * @package Kaliop\Migration\Core\API
+ * @package Kaliop\eZMigrationBundle\Core\API
  */
 class ReferenceHandler
 {
diff --git a/Core/Configuration.php b/Core/Configuration.php
index 1a35b918..7893feb8 100755
--- a/Core/Configuration.php
+++ b/Core/Configuration.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Kaliop\Migration\Core;
+namespace Kaliop\eZMigrationBundle\Core;
 
 use eZ\Bundle\EzPublishCoreBundle\Console\Application;
-use Kaliop\Migration\Core\DefinitionHandlers\SQLDefinitionHandler;
-use Kaliop\Migration\Core\DefinitionHandlers\YamlDefinitionHandler;
-use Kaliop\Migration\Interfaces\BundleAwareInterface;
+use Kaliop\eZMigrationBundle\Core\DefinitionHandlers\SQLDefinitionHandler;
+use Kaliop\eZMigrationBundle\Core\DefinitionHandlers\YamlDefinitionHandler;
+use Kaliop\eZMigrationBundle\Interfaces\BundleAwareInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -17,7 +17,7 @@
  *
  * Main configuration object holding settings for the migrations.
  *
- * @package Kaliop\Migration\Core
+ * @package Kaliop\eZMigrationBundle\Core
  */
 class Configuration
 {
@@ -465,7 +465,7 @@ public function injectContainerIntoMigrations(ContainerInterface $container)
     {
         foreach ($this->versions as $bundle => $versions) {
             foreach ($versions as $version) {
-                /** @var $version \Kaliop\Migration\Core\Version */
+                /** @var $version \Kaliop\eZMigrationBundle\Core\Version */
                 if ($version->migration instanceof ContainerAwareInterface) {
                     $version->migration->setContainer($container);
                 }
@@ -484,7 +484,7 @@ public function injectBundleIntoMigration(KernelInterface $kernel)
             $bundleObject = $kernel->getBundle($bundle);
 
             foreach ($versions as $version) {
-                /** @var $version \Kaliop\Migration\Core\Version */
+                /** @var $version \Kaliop\eZMigrationBundle\Core\Version */
                 if ($version->migration instanceof BundleAwareInterface) {
                     $version->migration->setBundle($bundleObject);
                 }
diff --git a/Core/DefinitionHandlers/SQLDefinitionHandler.php b/Core/DefinitionHandlers/SQLDefinitionHandler.php
index e618a281..37a72135 100755
--- a/Core/DefinitionHandlers/SQLDefinitionHandler.php
+++ b/Core/DefinitionHandlers/SQLDefinitionHandler.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Kaliop\Migration\Core\DefinitionHandlers;
+namespace Kaliop\eZMigrationBundle\Core\DefinitionHandlers;
 
-use Kaliop\Migration\Interfaces\BundleAwareInterface;
-use Kaliop\Migration\Interfaces\VersionInterface;
+use Kaliop\eZMigrationBundle\Interfaces\BundleAwareInterface;
+use Kaliop\eZMigrationBundle\Interfaces\VersionInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
diff --git a/Core/DefinitionHandlers/YamlDefinitionHandler.php b/Core/DefinitionHandlers/YamlDefinitionHandler.php
index 41a3811d..540f29ae 100755
--- a/Core/DefinitionHandlers/YamlDefinitionHandler.php
+++ b/Core/DefinitionHandlers/YamlDefinitionHandler.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Kaliop\Migration\Core\DefinitionHandlers;
-
-use Kaliop\Migration\Core\API\Managers\ContentManager;
-use Kaliop\Migration\Core\API\Managers\ContentTypeManager;
-use Kaliop\Migration\Core\API\Managers\LocationManager;
-use Kaliop\Migration\Core\API\Managers\RoleManager;
-use Kaliop\Migration\Core\API\Managers\UserGroupManager;
-use Kaliop\Migration\Core\API\Managers\UserManager;
-use Kaliop\Migration\Interfaces\BundleAwareInterface;
-use Kaliop\Migration\Interfaces\VersionInterface;
+namespace Kaliop\eZMigrationBundle\Core\DefinitionHandlers;
+
+use Kaliop\eZMigrationBundle\Core\API\Managers\ContentManager;
+use Kaliop\eZMigrationBundle\Core\API\Managers\ContentTypeManager;
+use Kaliop\eZMigrationBundle\Core\API\Managers\LocationManager;
+use Kaliop\eZMigrationBundle\Core\API\Managers\RoleManager;
+use Kaliop\eZMigrationBundle\Core\API\Managers\UserGroupManager;
+use Kaliop\eZMigrationBundle\Core\API\Managers\UserManager;
+use Kaliop\eZMigrationBundle\Interfaces\BundleAwareInterface;
+use Kaliop\eZMigrationBundle\Interfaces\VersionInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
@@ -20,7 +20,7 @@
  *
  * This class handles Yaml migration definitions.
  *
- * @package Kaliop\Migration\Core\DefinitionHandlers
+ * @package Kaliop\eZMigrationBundle\Core\DefinitionHandlers
  */
 class YamlDefinitionHandler implements VersionInterface, ContainerAwareInterface, BundleAwareInterface
 {
diff --git a/Core/Version.php b/Core/Version.php
index 1ce14ca3..0269053e 100755
--- a/Core/Version.php
+++ b/Core/Version.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Kaliop\Migration\Core;
+namespace Kaliop\eZMigrationBundle\Core;
 
 /**
  * Class Version
  *
  * Class to encapsulate a migration definition. This allows for different migration definitions eg.: PHP or Yaml.
  *
- * @package Kaliop\Migration\Core
+ * @package Kaliop\eZMigrationBundle\Core
  */
 class Version
 {
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 5422b107..6d5c715b 100755
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kaliop\Migration\DependencyInjection;
+namespace Kaliop\eZMigrationBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
diff --git a/DependencyInjection/EzMigrationBundleExtension.php b/DependencyInjection/EzMigrationBundleExtension.php
index a4ad3a04..fc7558b4 100755
--- a/DependencyInjection/EzMigrationBundleExtension.php
+++ b/DependencyInjection/EzMigrationBundleExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kaliop\Migration\DependencyInjection;
+namespace Kaliop\eZMigrationBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
diff --git a/EzMigrationBundle.php b/EzMigrationBundle.php
index 85c1e4e9..ca0bbfdb 100755
--- a/EzMigrationBundle.php
+++ b/EzMigrationBundle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kaliop\Migration;
+namespace Kaliop\eZMigrationBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
diff --git a/Interfaces/API/ManagerInterface.php b/Interfaces/API/ManagerInterface.php
index 79a22778..89579a9c 100755
--- a/Interfaces/API/ManagerInterface.php
+++ b/Interfaces/API/ManagerInterface.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Kaliop\Migration\Interfaces\API;
+namespace Kaliop\eZMigrationBundle\Interfaces\API;
 
 /**
  * Class ManagerInterface
  *
  * Interface that all migration definition handlers need to implement.
  *
- * @package Kaliop\Migration\Interfaces\API
+ * @package Kaliop\eZMigrationBundle\Interfaces\API
  */
 interface ManagerInterface {
 
diff --git a/Interfaces/BundleAwareInterface.php b/Interfaces/BundleAwareInterface.php
index e92865b0..a53ff590 100755
--- a/Interfaces/BundleAwareInterface.php
+++ b/Interfaces/BundleAwareInterface.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Kaliop\Migration\Interfaces;
+namespace Kaliop\eZMigrationBundle\Interfaces;
 
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
  * The BundleAwareInterface should be implemented by classes that require access to a bundle object.
  *
- * @package Kaliop\Migration\Interfaces
+ * @package Kaliop\eZMigrationBundle\Interfaces
  */
 interface BundleAwareInterface
 {
diff --git a/Interfaces/VersionInterface.php b/Interfaces/VersionInterface.php
index 10e640bf..3273d144 100755
--- a/Interfaces/VersionInterface.php
+++ b/Interfaces/VersionInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kaliop\Migration\Interfaces;
+namespace Kaliop\eZMigrationBundle\Interfaces;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Connection;
@@ -10,7 +10,7 @@
  *
  * All version definitions need to implement this interface
  *
- * @package Kaliop\Migration\Interfaces
+ * @package Kaliop\eZMigrationBundle\Interfaces
  */
 interface VersionInterface
 {
diff --git a/README.md b/README.md
index e5a9c40d..458569eb 100755
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ The `registerBundles` method should look similar to:
             new EzPublishCoreBundle(),
             new EzPublishLegacyBundle(),
             new EzPublishRestBundle(),
-            new Kaliop\Migration\EzMigrationBundle()
+            new Kaliop\eZMigrationBundle\EzMigrationBundle()
         );
     }
 
@@ -93,7 +93,7 @@ Generate command's help output:
      kaliop:migration:generate [--type[="..."]] [--dbserver[="..."]] [bundle]
 
     Arguments:
-     bundle                The bundle to generate the migration definition file in. eg.: KaliopBundleMigrationBundle
+     bundle                The bundle to generate the migration definition file in. eg.: AcmeMigrationBundle
 
     Options:
      --type                The type of migration file to generate. (yml, php, sql) (default: "yml")
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 5fd24c14..510654f4 100755
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -1,9 +1,9 @@
 parameters:
-#    kaliop_bundle_migration.example.class: Kaliop\Migration\BundleMigrationBundle\Example
+#    acme_bundle_migration.example.class: Acme\Migration\AcmeMigrationBundle\Example
     kaliop_bundle_migration.version_directory: 'MigrationVersions'
     kaliop_bundle_migration.table_name: 'kaliop_versions'
 
 services:
-#    kaliop_bundle_migration.example:
-#        class: %kaliop_bundle_migration.example.class%
+#    acme_bundle_migration.example:
+#        class: %acme_bundle_migration.example.class%
 #        arguments: [@service_id, "plain_value", %parameter%]
diff --git a/Tests/BundleMigrationDBTestCase.php b/Tests/BundleMigrationDBTestCase.php
index a93f9068..686b1d4b 100755
--- a/Tests/BundleMigrationDBTestCase.php
+++ b/Tests/BundleMigrationDBTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kaliop\Migration\Tests;
+namespace Kaliop\eZMigrationBundle\Tests;
 
 use Doctrine\DBAL\DriverManager;
 
diff --git a/Tests/BundleMigrationTestCase.php b/Tests/BundleMigrationTestCase.php
index 4c9ab590..0803e4c1 100755
--- a/Tests/BundleMigrationTestCase.php
+++ b/Tests/BundleMigrationTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kaliop\Migration\Tests;
+namespace Kaliop\eZMigrationBundle\Tests;
 
 abstract class BundleMigrationTestCase extends \PHPUnit_Framework_TestCase
 {
diff --git a/Tests/Core/ConfigurationTest.php b/Tests/Core/ConfigurationTest.php
index 94797874..12c20f3e 100755
--- a/Tests/Core/ConfigurationTest.php
+++ b/Tests/Core/ConfigurationTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Kaliop\Migration\Tests\Core;
+namespace Kaliop\eZMigrationBundle\Tests\Core;
 
 
 use Doctrine\DBAL\Driver\Connection;
-use Kaliop\Migration\Core\Configuration;
-use Kaliop\Migration\Tests\BundleMigrationDBTestCase;
+use Kaliop\eZMigrationBundle\Core\Configuration;
+use Kaliop\eZMigrationBundle\Tests\BundleMigrationDBTestCase;
 use MyProject\Proxies\__CG__\OtherProject\Proxies\__CG__\stdClass;
 use org\bovigo\vfs\vfsStream;
 use Symfony\Component\Console\Output\ConsoleOutput;
@@ -14,7 +14,7 @@ class ConfigurationTest extends BundleMigrationDBTestCase {
     /**
      * The BundleMigration Configuration instance.
      *
-     * @var \Kaliop\Migration\Core\Configuration
+     * @var \Kaliop\eZMigrationBundle\Core\Configuration
      */
     protected $configuration;
 
@@ -52,8 +52,8 @@ public function testCreateVersionTable()
     }
 
     /**
-     * @covers \Kaliop\Migration\Core\Configuration::createVersionTable()
-     * @covers \Kaliop\Migration\Core\Configuration::getConnection()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::createVersionTable()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::getConnection()
      */
     public function testGetMigratedVersionsByBundle() {
         $this->configuration->createVersionTable();
@@ -77,9 +77,9 @@ public function testGetMigratedVersionsByBundle() {
     }
 
     /**
-     * @covers \Kaliop\Migration\Core\Configuration::createVersionTable()
-     * @covers \Kaliop\Migration\Core\Configuration::getConnection()
-     * @covers \Kaliop\Migration\Core\Configuration::setVersions()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::createVersionTable()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::getConnection()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::setVersions()
      */
     public function testGetCurrentVersionByBundle() {
         $this->configuration->createVersionTable();
@@ -106,10 +106,10 @@ public function testGetCurrentVersionByBundle() {
     }
 
     /**
-     * @covers \Kaliop\Migration\Core\Configuration::createVersionTable()
-     * @covers \Kaliop\Migration\Core\Configuration::getConnection()
-     * @covers \Kaliop\Migration\Core\Configuration::setVersions()
-     * @covers \Kaliop\Migration\Core\Configuration::getCurrentVersionByBundle()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::createVersionTable()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::getConnection()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::setVersions()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::getCurrentVersionByBundle()
      */
     public function testGetCurrentBundleVersions() {
         $this->configuration->createVersionTable();
@@ -150,8 +150,8 @@ public function testGetCurrentBundleVersions() {
     }
 
     /**
-     * @covers \Kaliop\Migration\Core\Configuration::createVersionTable()
-     * @covers \Kaliop\Migration\Core\Configuration::getConnection()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::createVersionTable()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::getConnection()
      */
     public function testGetMigratedVersions() {
         $this->configuration->createVersionTable();
@@ -201,8 +201,8 @@ public function testGetMigratedVersions() {
     }
 
     /**
-     * @covers \Kaliop\Migration\Core\Configuration::createVersionTable()
-     * @covers \Kaliop\Migration\Core\Configuration::getConnection()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::createVersionTable()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::getConnection()
      */
     public function testMigrationsToExecute() {
         $this->configuration->createVersionTable();
@@ -261,8 +261,8 @@ public function testMigrationsToExecute() {
     }
 
     /**
-     * @covers \Kaliop\Migration\Core\Configuration::createVersionTable()
-     * @covers \Kaliop\Migration\Core\Configuration::getMigratedVersionsByBundle()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::createVersionTable()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::getMigratedVersionsByBundle()
      */
     public function testMarkVersionMigrated() {
         $this->configuration->createVersionTable();
@@ -283,9 +283,9 @@ public function testMarkVersionMigrated() {
     }
 
     /**
-     * @covers \Kaliop\Migration\Core\Configuration::createVersionTable()
-     * @covers \Kaliop\Migration\Core\Configuration::markVersionMigrated()
-     * @covers \Kaliop\Migration\Core\Configuration::getMigratedVersionsByBundle()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::createVersionTable()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::markVersionMigrated()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::getMigratedVersionsByBundle()
      */
     public function testMarkVersionNotMigrated() {
         $this->configuration->createVersionTable();
@@ -316,7 +316,7 @@ public function testMarkVersionNotMigrated() {
     }
 
     /**
-     * @covers \Kaliop\Migration\Core\Configuration::createVersionTable()
+     * @covers \Kaliop\eZMigrationBundle\Core\Configuration::createVersionTable()
      * @todo Work out how this could be tested.
      */
     public function testRegisterVersionFromDirectories() {
@@ -396,7 +396,7 @@ private function setupVfsStructure() {
      *
      * @var string
      */
-    private $dummyVersionContent = 'use Kaliop\Migration\Interfaces\VersionInterface;
+    private $dummyVersionContent = 'use Kaliop\eZMigrationBundle\Interfaces\VersionInterface;
         use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
         class Version20131001144810 implements VersionInterface, ContainerAwareInterface
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
index 67785872..6c17b82a 100755
--- a/Tests/bootstrap.php
+++ b/Tests/bootstrap.php
@@ -1,4 +1,4 @@
 <?php
 
 $loader = require_once __DIR__ . '/../vendor/autoload.php';
-$loader->add('Kaliop\Migration\Tests', __DIR__);
\ No newline at end of file
+$loader->add('Kaliop\eZMigrationBundle\Tests', __DIR__);
\ No newline at end of file
diff --git a/composer.json b/composer.json
index fae42f3c..7cc551db 100755
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,6 @@
         "phpunit/phpunit": "~4.0"
     },
     "autoload": {
-        "psr-4": { "Kaliop\\Migration\\": "" }
+        "psr-4": { "Kaliop\\eZMigrationBundle\\": "" }
     }
 }
diff --git a/features/Context/FeatureContext.php b/features/Context/FeatureContext.php
index 4982a706..abec62c5 100755
--- a/features/Context/FeatureContext.php
+++ b/features/Context/FeatureContext.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Kaliop\Migration\features\Context;
+namespace Kaliop\eZMigrationBundle\features\Context;
 
 use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
 use eZ\Publish\Core\Repository\Values\ContentType\ContentTypeGroup;