diff --git a/bin/doctrine.php b/bin/doctrine.php
index b6080bdd9..cd507f6c7 100644
--- a/bin/doctrine.php
+++ b/bin/doctrine.php
@@ -18,14 +18,14 @@ if (file_exists($configFile)) {
     require $configFile;
     
     foreach ($GLOBALS as $configCandidate) {
-        if ($configCandidate instanceof \Doctrine\Common\Cli\Configuration) {
+        if ($configCandidate instanceof \Doctrine\Common\CLI\Configuration) {
             $configuration = $configCandidate;
             break;
         }
     }
 }
 
-$configuration = ($configuration) ?: new \Doctrine\Common\Cli\Configuration();
+$configuration = ($configuration) ?: new \Doctrine\Common\CLI\Configuration();
 
-$cli = new \Doctrine\Common\Cli\CliController($configuration);
+$cli = new \Doctrine\Common\CLI\CLIController($configuration);
 $cli->run($_SERVER['argv']);
\ No newline at end of file
diff --git a/lib/Doctrine/Common/Cli/AbstractNamespace.php b/lib/Doctrine/Common/CLI/AbstractNamespace.php
similarity index 98%
rename from lib/Doctrine/Common/Cli/AbstractNamespace.php
rename to lib/Doctrine/Common/CLI/AbstractNamespace.php
index 58851f180..fb552c118 100644
--- a/lib/Doctrine/Common/Cli/AbstractNamespace.php
+++ b/lib/Doctrine/Common/CLI/AbstractNamespace.php
@@ -19,7 +19,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Cli;
+namespace Doctrine\Common\CLI;
 
 use Doctrine\Common\Util\Inflector;
 
@@ -73,7 +73,7 @@ abstract class AbstractNamespace
         $name = self::formatName($name);
 
         if ($this->hasNamespace($name)) {
-            throw CliException::cannotOverrideNamespace($name);
+            throw CLIException::cannotOverrideNamespace($name);
         }
 
         return $this->overrideNamespace($name);
diff --git a/lib/Doctrine/Common/Cli/CliController.php b/lib/Doctrine/Common/CLI/CLIController.php
similarity index 94%
rename from lib/Doctrine/Common/Cli/CliController.php
rename to lib/Doctrine/Common/CLI/CLIController.php
index 0b8f5cdba..d11fc708a 100644
--- a/lib/Doctrine/Common/Cli/CliController.php
+++ b/lib/Doctrine/Common/CLI/CLIController.php
@@ -19,7 +19,7 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli;
+namespace Doctrine\Common\CLI;
 
 /**
  * Generic CLI Controller of Tasks execution
@@ -27,7 +27,7 @@ namespace Doctrine\Common\Cli;
  * To include a new Task support, create a task:
  *
  *     [php]
- *     class MyProject\Tools\Cli\Tasks\MyTask extends Doctrine\ORM\Tools\Cli\Tasks\AbstractTask
+ *     class MyProject\Tools\CLI\Tasks\MyTask extends Doctrine\ORM\Tools\CLI\Tasks\AbstractTask
  *     {
  *         public function run();
  *         public function basicHelp();
@@ -38,9 +38,9 @@ namespace Doctrine\Common\Cli;
  * And then, load the namespace assoaicated an include the support to it in your command-line script:
  *
  *     [php]
- *     $cli = new Doctrine\Common\Cli\CliController();
+ *     $cli = new Doctrine\Common\CLI\CLIController();
  *     $cliNS = $cli->getNamespace('custom');
- *     $cliNS->addTask('myTask', 'MyProject\Tools\Cli\Tasks\MyTask');
+ *     $cliNS->addTask('myTask', 'MyProject\Tools\CLI\Tasks\MyTask');
  *
  * To execute, just type any classify-able name:
  *
@@ -55,7 +55,7 @@ namespace Doctrine\Common\Cli;
  * @author  Jonathan Wage <jonwage@gmail.com>
  * @author  Roman Borschel <roman@code-factory.org>
  */
-class CliController extends AbstractNamespace
+class CLIController extends AbstractNamespace
 {
     /**
      * The CLI processor of tasks
@@ -69,12 +69,12 @@ class CliController extends AbstractNamespace
         $this->setConfiguration($config);
 
         // Include core namespaces of tasks
-        $ns = 'Doctrine\Common\Cli\Tasks';
+        $ns = 'Doctrine\Common\CLI\Tasks';
         $this->addNamespace('Core')
              ->addTask('help', $ns . '\HelpTask')
              ->addTask('version', $ns . '\VersionTask');
 
-        $ns = 'Doctrine\ORM\Tools\Cli\Tasks';
+        $ns = 'Doctrine\ORM\Tools\CLI\Tasks';
         $this->addNamespace('Orm')
              ->addTask('clear-cache', $ns . '\ClearCacheTask')
              ->addTask('convert-mapping', $ns . '\ConvertMappingTask')
@@ -87,7 +87,7 @@ class CliController extends AbstractNamespace
              ->addTask('generate-entities', $ns . '\GenerateEntitiesTask')
              ->addTask('generate-repositories', $ns . '\GenerateRepositoriesTask');
 
-        $ns = 'Doctrine\DBAL\Tools\Cli\Tasks';
+        $ns = 'Doctrine\DBAL\Tools\CLI\Tasks';
         $this->addNamespace('Dbal')
              ->addTask('run-sql', $ns . '\RunSqlTask')
              ->addTask('version', $ns . '\VersionTask');
@@ -98,12 +98,12 @@ class CliController extends AbstractNamespace
      * Example of inclusion support to a single task:
      *
      *     [php]
-     *     $cli->addTask('my-custom-task', 'MyProject\Cli\Tasks\MyCustomTask');
+     *     $cli->addTask('my-custom-task', 'MyProject\CLI\Tasks\MyCustomTask');
      *
      * @param string $name CLI Task name
      * @param string $class CLI Task class (FQCN - Fully Qualified Class Name)
      *
-     * @return CliController This object instance
+     * @return CLIController This object instance
      */
     public function addTask($name, $class)
     {
@@ -294,7 +294,7 @@ class CliController extends AbstractNamespace
 
             // If the given namespace returned "null", throw exception
             if ($taskNamespace === null) {
-                throw CliException::namespaceDoesNotExist($namespaceName, $currentNamespacePath);
+                throw CLIException::namespaceDoesNotExist($namespaceName, $currentNamespacePath);
             }
 
             $currentNamespacePath = (( ! empty($currentNamespacePath)) ? ':' : '') 
diff --git a/lib/Doctrine/Common/Cli/CliException.php b/lib/Doctrine/Common/CLI/CLIException.php
similarity index 95%
rename from lib/Doctrine/Common/Cli/CliException.php
rename to lib/Doctrine/Common/CLI/CLIException.php
index c04fcff13..33b0a609d 100644
--- a/lib/Doctrine/Common/Cli/CliException.php
+++ b/lib/Doctrine/Common/CLI/CLIException.php
@@ -19,7 +19,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Cli;
+namespace Doctrine\Common\CLI;
 
 /**
  * CLI Exception class
@@ -33,7 +33,7 @@ namespace Doctrine\Common\Cli;
  * @author  Jonathan Wage <jonwage@gmail.com>
  * @author  Roman Borschel <roman@code-factory.org>
  */
-class CliException extends \Doctrine\Common\CommonException
+class CLIException extends \Exception
 {
     public static function namespaceDoesNotExist($namespaceName, $namespacePath = '')
     {
diff --git a/lib/Doctrine/Common/Cli/Configuration.php b/lib/Doctrine/Common/CLI/Configuration.php
similarity index 98%
rename from lib/Doctrine/Common/Cli/Configuration.php
rename to lib/Doctrine/Common/CLI/Configuration.php
index 5ac6f8bea..99a6ad18e 100644
--- a/lib/Doctrine/Common/Cli/Configuration.php
+++ b/lib/Doctrine/Common/CLI/Configuration.php
@@ -19,7 +19,7 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli;
+namespace Doctrine\Common\CLI;
 
 /**
  * CLI Configuration class
diff --git a/lib/Doctrine/Common/Cli/Option.php b/lib/Doctrine/Common/CLI/Option.php
similarity index 98%
rename from lib/Doctrine/Common/Cli/Option.php
rename to lib/Doctrine/Common/CLI/Option.php
index 5096898fe..d50427f2d 100644
--- a/lib/Doctrine/Common/Cli/Option.php
+++ b/lib/Doctrine/Common/CLI/Option.php
@@ -19,7 +19,7 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli;
+namespace Doctrine\Common\CLI;
 
 /**
  * CLI Option definition
diff --git a/lib/Doctrine/Common/Cli/OptionGroup.php b/lib/Doctrine/Common/CLI/OptionGroup.php
similarity index 99%
rename from lib/Doctrine/Common/Cli/OptionGroup.php
rename to lib/Doctrine/Common/CLI/OptionGroup.php
index 1f99924a8..440d79e1b 100644
--- a/lib/Doctrine/Common/Cli/OptionGroup.php
+++ b/lib/Doctrine/Common/CLI/OptionGroup.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli;
+namespace Doctrine\Common\CLI;
 
-use Doctrine\Common\Cli\Printers\AbstractPrinter;
+use Doctrine\Common\CLI\Printers\AbstractPrinter;
 
 /**
  * CLI Option Group definition
diff --git a/lib/Doctrine/Common/Cli/Printers/AbstractPrinter.php b/lib/Doctrine/Common/CLI/Printers/AbstractPrinter.php
similarity index 98%
rename from lib/Doctrine/Common/Cli/Printers/AbstractPrinter.php
rename to lib/Doctrine/Common/CLI/Printers/AbstractPrinter.php
index dcdc27fcc..7dd1a7907 100644
--- a/lib/Doctrine/Common/Cli/Printers/AbstractPrinter.php
+++ b/lib/Doctrine/Common/CLI/Printers/AbstractPrinter.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli\Printers;
+namespace Doctrine\Common\CLI\Printers;
 
-use Doctrine\Common\Cli\Style;
+use Doctrine\Common\CLI\Style;
 
 /**
  * CLI Output Printer.
diff --git a/lib/Doctrine/Common/Cli/Printers/AnsiColorPrinter.php b/lib/Doctrine/Common/CLI/Printers/AnsiColorPrinter.php
similarity index 98%
rename from lib/Doctrine/Common/Cli/Printers/AnsiColorPrinter.php
rename to lib/Doctrine/Common/CLI/Printers/AnsiColorPrinter.php
index 62e30f156..ef78b9ed5 100644
--- a/lib/Doctrine/Common/Cli/Printers/AnsiColorPrinter.php
+++ b/lib/Doctrine/Common/CLI/Printers/AnsiColorPrinter.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli\Printers;
+namespace Doctrine\Common\CLI\Printers;
 
-use Doctrine\Common\Cli\Style;
+use Doctrine\Common\CLI\Style;
 
 /**
  * CLI Output Printer for ANSI Color terminal
diff --git a/lib/Doctrine/Common/Cli/Printers/NormalPrinter.php b/lib/Doctrine/Common/CLI/Printers/NormalPrinter.php
similarity index 95%
rename from lib/Doctrine/Common/Cli/Printers/NormalPrinter.php
rename to lib/Doctrine/Common/CLI/Printers/NormalPrinter.php
index 7ec05f170..2293be4fe 100644
--- a/lib/Doctrine/Common/Cli/Printers/NormalPrinter.php
+++ b/lib/Doctrine/Common/CLI/Printers/NormalPrinter.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli\Printers;
+namespace Doctrine\Common\CLI\Printers;
 
-use Doctrine\Common\Cli\Style;
+use Doctrine\Common\CLI\Style;
 
 /**
  * CLI Output Printer for Normal terminal
diff --git a/lib/Doctrine/Common/Cli/Style.php b/lib/Doctrine/Common/CLI/Style.php
similarity index 98%
rename from lib/Doctrine/Common/Cli/Style.php
rename to lib/Doctrine/Common/CLI/Style.php
index 87d23a30a..12a35acb5 100644
--- a/lib/Doctrine/Common/Cli/Style.php
+++ b/lib/Doctrine/Common/CLI/Style.php
@@ -19,7 +19,7 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli;
+namespace Doctrine\Common\CLI;
 
 /**
  * CLI Output Style
diff --git a/lib/Doctrine/Common/Cli/TaskDocumentation.php b/lib/Doctrine/Common/CLI/TaskDocumentation.php
similarity index 97%
rename from lib/Doctrine/Common/Cli/TaskDocumentation.php
rename to lib/Doctrine/Common/CLI/TaskDocumentation.php
index d275b9cf2..5cf658ff6 100644
--- a/lib/Doctrine/Common/Cli/TaskDocumentation.php
+++ b/lib/Doctrine/Common/CLI/TaskDocumentation.php
@@ -19,11 +19,11 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli;
+namespace Doctrine\Common\CLI;
 
-use Doctrine\Common\Cli\Printers\AbstractPrinter,
-    Doctrine\Common\Cli\OptionGroup,
-    Doctrine\Common\Cli\Option;
+use Doctrine\Common\CLI\Printers\AbstractPrinter,
+    Doctrine\Common\CLI\OptionGroup,
+    Doctrine\Common\CLI\Option;
 
 /**
  * CLI Task documentation
diff --git a/lib/Doctrine/Common/Cli/TaskNamespace.php b/lib/Doctrine/Common/CLI/TaskNamespace.php
similarity index 97%
rename from lib/Doctrine/Common/Cli/TaskNamespace.php
rename to lib/Doctrine/Common/CLI/TaskNamespace.php
index 43ba4ac7a..9c9936f47 100644
--- a/lib/Doctrine/Common/Cli/TaskNamespace.php
+++ b/lib/Doctrine/Common/CLI/TaskNamespace.php
@@ -19,7 +19,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Cli;
+namespace Doctrine\Common\CLI;
 
 /**
  * CLI Namespace class
@@ -81,7 +81,7 @@ class TaskNamespace extends AbstractNamespace
             return new $taskClass($this);
         }
 
-        throw CliException::taskDoesNotExist($name, $this->getFullName());
+        throw CLIException::taskDoesNotExist($name, $this->getFullName());
     }
 
     /**
@@ -129,7 +129,7 @@ class TaskNamespace extends AbstractNamespace
         $name = self::formatName($name);
 
         if ($this->hasTask($name)) {
-            throw CliException::cannotOverrideTask($name);
+            throw CLIException::cannotOverrideTask($name);
         }
 
         return $this->overrideTask($name, $class);
@@ -228,7 +228,7 @@ class TaskNamespace extends AbstractNamespace
             } else if ($task->validate()) {
                 $task->run();
             }
-        } catch (CliException $e) {
+        } catch (CLIException $e) {
             $message = $this->getFullName() . ':' . $name . ' => ' . $e->getMessage();
             $printer = $this->getPrinter();
 
diff --git a/lib/Doctrine/Common/Cli/Tasks/AbstractTask.php b/lib/Doctrine/Common/CLI/Tasks/AbstractTask.php
similarity index 97%
rename from lib/Doctrine/Common/Cli/Tasks/AbstractTask.php
rename to lib/Doctrine/Common/CLI/Tasks/AbstractTask.php
index 21b7b516d..28c783b0b 100644
--- a/lib/Doctrine/Common/Cli/Tasks/AbstractTask.php
+++ b/lib/Doctrine/Common/CLI/Tasks/AbstractTask.php
@@ -19,10 +19,10 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli\Tasks;
+namespace Doctrine\Common\CLI\Tasks;
 
-use Doctrine\Common\Cli\AbstractNamespace,
-    Doctrine\Common\Cli\TaskDocumentation;
+use Doctrine\Common\CLI\AbstractNamespace,
+    Doctrine\Common\CLI\TaskDocumentation;
 
 /**
  * Base class for CLI Tasks.
diff --git a/lib/Doctrine/Common/Cli/Tasks/HelpTask.php b/lib/Doctrine/Common/CLI/Tasks/HelpTask.php
similarity index 97%
rename from lib/Doctrine/Common/Cli/Tasks/HelpTask.php
rename to lib/Doctrine/Common/CLI/Tasks/HelpTask.php
index 0fe3116e6..7e25a00dd 100644
--- a/lib/Doctrine/Common/Cli/Tasks/HelpTask.php
+++ b/lib/Doctrine/Common/CLI/Tasks/HelpTask.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli\Tasks;
+namespace Doctrine\Common\CLI\Tasks;
 
-use Doctrine\Common\Cli\CliException;
+use Doctrine\Common\CLI\CLIException;
 
 /**
  * CLI Task to display available commands help
diff --git a/lib/Doctrine/Common/Cli/Tasks/VersionTask.php b/lib/Doctrine/Common/CLI/Tasks/VersionTask.php
similarity index 98%
rename from lib/Doctrine/Common/Cli/Tasks/VersionTask.php
rename to lib/Doctrine/Common/CLI/Tasks/VersionTask.php
index 152c2c6da..119d08753 100644
--- a/lib/Doctrine/Common/Cli/Tasks/VersionTask.php
+++ b/lib/Doctrine/Common/CLI/Tasks/VersionTask.php
@@ -19,7 +19,7 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\Common\Cli\Tasks;
+namespace Doctrine\Common\CLI\Tasks;
 
 use Doctrine\Common\Version;
 
diff --git a/lib/Doctrine/DBAL/Tools/Cli/Tasks/RunSqlTask.php b/lib/Doctrine/DBAL/Tools/CLI/Tasks/RunSqlTask.php
similarity index 93%
rename from lib/Doctrine/DBAL/Tools/Cli/Tasks/RunSqlTask.php
rename to lib/Doctrine/DBAL/Tools/CLI/Tasks/RunSqlTask.php
index 5100c9c64..bacc92e18 100644
--- a/lib/Doctrine/DBAL/Tools/Cli/Tasks/RunSqlTask.php
+++ b/lib/Doctrine/DBAL/Tools/CLI/Tasks/RunSqlTask.php
@@ -19,13 +19,13 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\DBAL\Tools\Cli\Tasks;
+namespace Doctrine\DBAL\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
-    Doctrine\Common\Cli\CliException,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
+    Doctrine\Common\CLI\CLIException,
     Doctrine\Common\Util\Debug,
-    Doctrine\Common\Cli\Option,
-    Doctrine\Common\Cli\OptionGroup;
+    Doctrine\Common\CLI\Option,
+    Doctrine\Common\CLI\OptionGroup;
 
 /**
  * Task for executing arbitrary SQL that can come from a file or directly from
@@ -78,13 +78,13 @@ class RunSqlTask extends AbstractTask
         $em = $this->getConfiguration()->getAttribute('em');
         
         if ($em === null) {
-            throw new CliException(
+            throw new CLIException(
                 "Attribute 'em' of CLI Configuration is not defined or it is not a valid EntityManager."
             );
         }
         
         if ( ! (isset($arguments['sql']) ^ isset($arguments['file']))) {
-            throw new CliException('One of --sql or --file required, and only one.');
+            throw new CLIException('One of --sql or --file required, and only one.');
         }
         
         return true;
@@ -107,9 +107,9 @@ class RunSqlTask extends AbstractTask
             
             foreach ($fileNames as $fileName) {
                 if ( ! file_exists($fileName)) {
-                    throw new CliException(sprintf('The SQL file [%s] does not exist.', $fileName));
+                    throw new CLIException(sprintf('The SQL file [%s] does not exist.', $fileName));
                 } else if ( ! is_readable($fileName)) {
-                    throw new CliException(sprintf('The SQL file [%s] does not have read permissions.', $fileName));
+                    throw new CLIException(sprintf('The SQL file [%s] does not have read permissions.', $fileName));
                 }
 
                 $printer->write('Processing file [' . $fileName . ']... ');
diff --git a/lib/Doctrine/DBAL/Tools/Cli/Tasks/VersionTask.php b/lib/Doctrine/DBAL/Tools/CLI/Tasks/VersionTask.php
similarity index 96%
rename from lib/Doctrine/DBAL/Tools/Cli/Tasks/VersionTask.php
rename to lib/Doctrine/DBAL/Tools/CLI/Tasks/VersionTask.php
index f21b594f1..273132d9b 100644
--- a/lib/Doctrine/DBAL/Tools/Cli/Tasks/VersionTask.php
+++ b/lib/Doctrine/DBAL/Tools/CLI/Tasks/VersionTask.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\DBAL\Tools\Cli\Tasks;
+namespace Doctrine\DBAL\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
     Doctrine\Common\Version;
 
 /**
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/ClearCacheTask.php
similarity index 94%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/ClearCacheTask.php
index b0057e4b5..5dcfed081 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/ClearCacheTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/ClearCacheTask.php
@@ -19,12 +19,12 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
-    Doctrine\Common\Cli\CliException,
-    Doctrine\Common\Cli\Option,
-    Doctrine\Common\Cli\OptionGroup,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
+    Doctrine\Common\CLI\CliException,
+    Doctrine\Common\CLI\Option,
+    Doctrine\Common\CLI\OptionGroup,
     Doctrine\Common\Cache\AbstractDriver;
 
 /**
@@ -79,7 +79,7 @@ class ClearCacheTask extends AbstractTask
         $em = $this->getConfiguration()->getAttribute('em');
         
         if ($em === null) {
-            throw new CliException(
+            throw new CLIException(
                 "Attribute 'em' of CLI Configuration is not defined or it is not a valid EntityManager."
             );
         }
@@ -90,7 +90,7 @@ class ClearCacheTask extends AbstractTask
             (isset($arguments['query']) || isset($arguments['metadata'])) && (isset($arguments['id']) || 
             isset($arguments['regex']) || isset($arguments['prefix']) || isset($arguments['suffix']))
         ) {
-            throw new CliException(
+            throw new CLIException(
                 'When clearing the query or metadata cache do not ' .
                 'specify any --id, --regex, --prefix or --suffix.'
             );
@@ -148,7 +148,7 @@ class ClearCacheTask extends AbstractTask
         $printer = $this->getPrinter();
 
         if ( ! $cacheDriver) {
-            throw new CliException('No driver has been configured for the ' . $type . ' cache.');
+            throw new CLIException('No driver has been configured for the ' . $type . ' cache.');
         }
 
         if ($id) {
@@ -197,7 +197,7 @@ class ClearCacheTask extends AbstractTask
                 $printer->writeln(' - ' . $id);
             }
         } else {
-            throw new CliException('No ' . $type . ' cache entries found.');
+            throw new CLIException('No ' . $type . ' cache entries found.');
         }
         
         $printer->write(PHP_EOL);
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertDoctrine1SchemaTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/ConvertDoctrine1SchemaTask.php
similarity index 93%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertDoctrine1SchemaTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/ConvertDoctrine1SchemaTask.php
index adda7aa40..170f09064 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertDoctrine1SchemaTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/ConvertDoctrine1SchemaTask.php
@@ -19,13 +19,13 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
     Doctrine\ORM\Tools\Export\ClassMetadataExporter,
-    Doctrine\Common\Cli\CliException,
-    Doctrine\Common\Cli\Option,
-    Doctrine\Common\Cli\OptionGroup,
+    Doctrine\Common\CLI\CliException,
+    Doctrine\Common\CLI\Option,
+    Doctrine\Common\CLI\OptionGroup,
     Doctrine\ORM\Tools\ConvertDoctrine1Schema,
     Doctrine\ORM\Tools\EntityGenerator;
 
@@ -70,7 +70,7 @@ class ConvertDoctrine1SchemaTask extends AbstractTask
         $em = $this->getConfiguration()->getAttribute('em');
 
         if ( ! isset($arguments['from']) || ! isset($arguments['to']) || ! isset($arguments['dest'])) {
-            throw new CliException('You must specify a value for --from, --to and --dest');
+            throw new CLIException('You must specify a value for --from, --to and --dest');
         }
 
         return true;
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/ConvertMappingTask.php
similarity index 94%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/ConvertMappingTask.php
index 73577cbc7..3a74953dc 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/ConvertMappingTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/ConvertMappingTask.php
@@ -19,12 +19,12 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
-    Doctrine\Common\Cli\CliException,
-    Doctrine\Common\Cli\Option,
-    Doctrine\Common\Cli\OptionGroup,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
+    Doctrine\Common\CLI\CliException,
+    Doctrine\Common\CLI\Option,
+    Doctrine\Common\CLI\OptionGroup,
     Doctrine\ORM\Tools\Export\ClassMetadataExporter,
     Doctrine\ORM\Mapping\Driver\DriverChain,
     Doctrine\ORM\Mapping\Driver\AnnotationDriver,
@@ -78,13 +78,13 @@ class ConvertMappingTask extends AbstractTask
         }
 
         if (!(isset($arguments['from']) && isset($arguments['to']) && isset($arguments['dest']))) {
-            throw new CliException(
+            throw new CLIException(
                 'You must include a value for all three options: --from, --to and --dest.'
             );
         }
         
         if (strtolower($arguments['to']) != 'annotation' && isset($arguments['extend'])) {
-            throw new CliException(
+            throw new CLIException(
                 'You can only use the --extend argument when converting to annotations.'
             );
         }
@@ -94,7 +94,7 @@ class ConvertMappingTask extends AbstractTask
             $em = $this->getConfiguration()->getAttribute('em');
         
             if ($em === null) {
-                throw new CliException(
+                throw new CLIException(
                     "Attribute 'em' of CLI Configuration is not defined or it is not a valid EntityManager."
                 );
             }
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/EnsureProductionSettingsTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/EnsureProductionSettingsTask.php
similarity index 94%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/EnsureProductionSettingsTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/EnsureProductionSettingsTask.php
index 52c83905e..effc6e969 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/EnsureProductionSettingsTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/EnsureProductionSettingsTask.php
@@ -19,10 +19,10 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
-    Doctrine\Common\Cli\CliException;
+use Doctrine\Common\CLI\Tasks\AbstractTask,
+    Doctrine\Common\CLI\CLIException;
 
 /**
  * CLI Task to ensure that Doctrine is properly configured for a production environment.
@@ -57,7 +57,7 @@ class EnsureProductionSettingsTask extends AbstractTask
         $em = $this->getConfiguration()->getAttribute('em');
         
         if ($em === null) {
-            throw new CliException(
+            throw new CLIException(
                 "Attribute 'em' of CLI Configuration is not defined or it is not a valid EntityManager."
             );
         }
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateEntitiesTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/GenerateEntitiesTask.php
similarity index 93%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateEntitiesTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/GenerateEntitiesTask.php
index 69b244cdf..3bc9c5262 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateEntitiesTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/GenerateEntitiesTask.php
@@ -19,12 +19,12 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
-    Doctrine\Common\Cli\Option,
-    Doctrine\Common\Cli\OptionGroup,
-    Doctrine\Common\Cli\CliException,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
+    Doctrine\Common\CLI\Option,
+    Doctrine\Common\CLI\OptionGroup,
+    Doctrine\Common\CLI\CLIException,
     Doctrine\ORM\Tools\EntityGenerator,
     Doctrine\ORM\Tools\ClassMetadataReader;
 
@@ -67,7 +67,7 @@ class GenerateEntitiesTask extends AbstractTask
         $arguments = $this->getArguments();
 
         if ( ! isset($arguments['from']) || ! isset($arguments['dest'])) {
-            throw new CliException('You must specify a value for --from and --dest');
+            throw new CLIException('You must specify a value for --from and --dest');
         }
 
         return true;
@@ -110,7 +110,7 @@ class GenerateEntitiesTask extends AbstractTask
 
         $entityGenerator->generate($metadatas, $dest);
 
-        $printer->writeln('');
+        $printer->write(PHP_EOL);
         $printer->writeln(
             sprintf('Entity classes generated to "%s"',
                 $printer->format($dest, 'KEYWORD')
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/GenerateProxiesTask.php
similarity index 92%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/GenerateProxiesTask.php
index 827ea9d44..e1589d59a 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateProxiesTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/GenerateProxiesTask.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
-    Doctrine\Common\Cli\CliException,
-    Doctrine\Common\Cli\Option,
-    Doctrine\Common\Cli\OptionGroup;
+use Doctrine\Common\CLI\Tasks\AbstractTask,
+    Doctrine\Common\CLI\CLIException,
+    Doctrine\Common\CLI\Option,
+    Doctrine\Common\CLI\OptionGroup;
 
 /**
  * Task to (re)generate the proxy classes used by doctrine.
@@ -50,7 +50,7 @@ class GenerateProxiesTask extends AbstractTask
         $em = $this->getConfiguration()->getAttribute('em');
         
         if ($em === null) {
-            throw new CliException(
+            throw new CLIException(
                 "Attribute 'em' of CLI Configuration is not defined or it is not a valid EntityManager."
             );
         }
@@ -61,7 +61,7 @@ class GenerateProxiesTask extends AbstractTask
             if (isset($arguments['class-dir'])) {
                 $metadataDriver->addPaths((array) $arguments['class-dir']);
             } else {
-                throw new CliException(
+                throw new CLIException(
                     'The supplied configuration uses the annotation metadata driver. ' .
                     "The 'class-dir' argument is required for this driver."
                 );
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateRepositoriesTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/GenerateRepositoriesTask.php
similarity index 94%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateRepositoriesTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/GenerateRepositoriesTask.php
index 6de19e559..5d1e6f53a 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/GenerateRepositoriesTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/GenerateRepositoriesTask.php
@@ -19,12 +19,12 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
-    Doctrine\Common\Cli\Option,
-    Doctrine\Common\Cli\OptionGroup,
-    Doctrine\Common\Cli\CliException,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
+    Doctrine\Common\CLI\Option,
+    Doctrine\Common\CLI\OptionGroup,
+    Doctrine\Common\CLI\CLIException,
     Doctrine\ORM\Tools\ClassMetadataReader;
 
 /**
@@ -84,7 +84,7 @@ class <className> extends EntityRepository
         $em = $this->getConfiguration()->getAttribute('em');
 
         if ( ! isset($arguments['from']) || ! isset($arguments['dest'])) {
-            throw new CliException('You must specify a value for --from and --dest');
+            throw new CLIException('You must specify a value for --from and --dest');
         }
 
         return true;
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/RunDqlTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/RunDqlTask.php
similarity index 90%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/RunDqlTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/RunDqlTask.php
index 95c448d6c..b7aead638 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/RunDqlTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/RunDqlTask.php
@@ -19,13 +19,13 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
-    Doctrine\Common\Cli\CliException,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
+    Doctrine\Common\CLI\CLIException,
     Doctrine\Common\Util\Debug,
-    Doctrine\Common\Cli\Option,
-    Doctrine\Common\Cli\OptionGroup,
+    Doctrine\Common\CLI\Option,
+    Doctrine\Common\CLI\OptionGroup,
     Doctrine\ORM\Query;
 
 /**
@@ -90,29 +90,29 @@ class RunDqlTask extends AbstractTask
         $em = $this->getConfiguration()->getAttribute('em');
         
         if ($em === null) {
-            throw new CliException(
+            throw new CLIException(
                 "Attribute 'em' of CLI Configuration is not defined or it is not a valid EntityManager."
             );
         }
         
         if ( ! isset($arguments['dql'])) {
-            throw new CliException('Argument --dql must be defined.');
+            throw new CLIException('Argument --dql must be defined.');
         }
 
         if (isset($arguments['hydrate'])) {
             $hydrationModeName = 'Doctrine\ORM\Query::HYDRATE_' . strtoupper(str_replace('-', '_', $arguments['hydrate']));
 
             if ( ! defined($hydrationModeName)) {
-                throw new CliException("Argument --hydrate must be either 'object', 'array', 'scalar' or 'single-scalar'.");
+                throw new CLIException("Argument --hydrate must be either 'object', 'array', 'scalar' or 'single-scalar'.");
             }
         }
 
         if (isset($arguments['first-result']) && ! ctype_digit($arguments['first-result'])) {
-            throw new CliException('Argument --first-result must be an integer value.');
+            throw new CLIException('Argument --first-result must be an integer value.');
         }
 
         if (isset($arguments['max-results']) && ! ctype_digit($arguments['max-results'])) {
-            throw new CliException('Argument --max-results must be an integer value.');
+            throw new CLIException('Argument --max-results must be an integer value.');
         }
         
         return true;
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/SchemaToolTask.php
similarity index 95%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/SchemaToolTask.php
index 61c211412..3564a8b01 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/SchemaToolTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/SchemaToolTask.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
-    Doctrine\Common\Cli\CliException,
-    Doctrine\Common\Cli\Option,
-    Doctrine\Common\Cli\OptionGroup,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
+    Doctrine\Common\CLI\CLIException,
+    Doctrine\Common\CLI\Option,
+    Doctrine\Common\CLI\OptionGroup,
     Doctrine\ORM\Tools\SchemaTool,
     Doctrine\Common\Annotations\AnnotationReader,
     Doctrine\ORM\Mapping\Driver\AnnotationDriver,
@@ -105,7 +105,7 @@ class SchemaToolTask extends AbstractTask
         $em = $this->getConfiguration()->getAttribute('em');
         
         if ($em === null) {
-            throw new CliException(
+            throw new CLIException(
                 "Attribute 'em' of CLI Configuration is not defined or it is not a valid EntityManager."
             );
         }
@@ -125,17 +125,17 @@ class SchemaToolTask extends AbstractTask
         $isCompleteUpdate = isset($arguments['complete-update']) && $arguments['complete-update'];
         
         if ($isUpdate && ($isCreate || $isDrop || $isCompleteUpdate)) {
-            throw new CliException(
+            throw new CLIException(
                 'You cannot use --update with --create, --drop or --complete-update.'
             );
         }
 
         if ($isCompleteUpdate && ($isCreate || $isDrop || $isUpdate)) {
-            throw new CliException('You cannot use --complete-update with --create, --drop or --update.');
+            throw new CLIException('You cannot use --complete-update with --create, --drop or --update.');
         }
 
         if ( ! ($isCreate || $isDrop || $isUpdate || $isCompleteUpdate)) {
-            throw new CliException(
+            throw new CLIException(
                 'You must specify at a minimum one of the options: ' .
                 '--create, --drop, --update, --re-create or --complete-update.'
             );
@@ -147,7 +147,7 @@ class SchemaToolTask extends AbstractTask
             if (isset($arguments['class-dir'])) {
                 $metadataDriver->addPaths((array) $arguments['class-dir']);
             } else {
-                throw new CliException(
+                throw new CLIException(
                     'The supplied configuration uses the annotation metadata driver. ' . 
                     "The 'class-dir' argument is required for this driver."
                 );
diff --git a/lib/Doctrine/ORM/Tools/Cli/Tasks/VersionTask.php b/lib/Doctrine/ORM/Tools/CLI/Tasks/VersionTask.php
similarity index 96%
rename from lib/Doctrine/ORM/Tools/Cli/Tasks/VersionTask.php
rename to lib/Doctrine/ORM/Tools/CLI/Tasks/VersionTask.php
index e73d9d7b2..e43f5128b 100644
--- a/lib/Doctrine/ORM/Tools/Cli/Tasks/VersionTask.php
+++ b/lib/Doctrine/ORM/Tools/CLI/Tasks/VersionTask.php
@@ -19,9 +19,9 @@
  * <http://www.doctrine-project.org>.
  */
  
-namespace Doctrine\ORM\Tools\Cli\Tasks;
+namespace Doctrine\ORM\Tools\CLI\Tasks;
 
-use Doctrine\Common\Cli\Tasks\AbstractTask,
+use Doctrine\Common\CLI\Tasks\AbstractTask,
     Doctrine\Common\Version;
 
 /**
diff --git a/tests/Doctrine/Tests/Common/AllTests.php b/tests/Doctrine/Tests/Common/AllTests.php
index c042c8db9..0afc81277 100644
--- a/tests/Doctrine/Tests/Common/AllTests.php
+++ b/tests/Doctrine/Tests/Common/AllTests.php
@@ -29,7 +29,7 @@ class AllTests
         $suite->addTest(Collections\AllTests::suite());
         $suite->addTest(Annotations\AllTests::suite());
         $suite->addTest(Cache\AllTests::suite());
-        $suite->addTest(Cli\AllTests::suite());
+        $suite->addTest(CLI\AllTests::suite());
 
         return $suite;
     }
diff --git a/tests/Doctrine/Tests/Common/Cli/AllTests.php b/tests/Doctrine/Tests/Common/CLI/AllTests.php
similarity index 55%
rename from tests/Doctrine/Tests/Common/Cli/AllTests.php
rename to tests/Doctrine/Tests/Common/CLI/AllTests.php
index a591c59d5..101309fe5 100644
--- a/tests/Doctrine/Tests/Common/Cli/AllTests.php
+++ b/tests/Doctrine/Tests/Common/CLI/AllTests.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Doctrine\Tests\Common\Cli;
+namespace Doctrine\Tests\Common\CLI;
 
 if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Common_Cli_AllTests::main');
@@ -19,16 +19,16 @@ class AllTests
     {
         $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Common CLI Tests');
 
-        $suite->addTestSuite('Doctrine\Tests\Common\Cli\ConfigurationTest');
-        $suite->addTestSuite('Doctrine\Tests\Common\Cli\OptionTest');
-        $suite->addTestSuite('Doctrine\Tests\Common\Cli\OptionGroupTest');
-        $suite->addTestSuite('Doctrine\Tests\Common\Cli\StyleTest');
-        //$suite->addTestSuite('Doctrine\Tests\Common\Cli\CliControllerTest');
+        $suite->addTestSuite('Doctrine\Tests\Common\CLI\ConfigurationTest');
+        $suite->addTestSuite('Doctrine\Tests\Common\CLI\OptionTest');
+        $suite->addTestSuite('Doctrine\Tests\Common\CLI\OptionGroupTest');
+        $suite->addTestSuite('Doctrine\Tests\Common\CLI\StyleTest');
+        //$suite->addTestSuite('Doctrine\Tests\Common\CLI\CLIControllerTest');
 
         return $suite;
     }
 }
 
-if (PHPUnit_MAIN_METHOD == 'Common_Cli_AllTests::main') {
+if (PHPUnit_MAIN_METHOD == 'Common_CLI_AllTests::main') {
     AllTests::main();
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/Common/Cli/CliControllerTest.php b/tests/Doctrine/Tests/Common/CLI/CLIControllerTest.php
similarity index 82%
rename from tests/Doctrine/Tests/Common/Cli/CliControllerTest.php
rename to tests/Doctrine/Tests/Common/CLI/CLIControllerTest.php
index d9ce8acc8..60d7214a7 100644
--- a/tests/Doctrine/Tests/Common/Cli/CliControllerTest.php
+++ b/tests/Doctrine/Tests/Common/CLI/CLIControllerTest.php
@@ -1,31 +1,31 @@
 <?php
 
-namespace Doctrine\Tests\Common\Cli;
+namespace Doctrine\Tests\Common\CLI;
 
 use Doctrine\Tests\Mocks\TaskMock;
-use Doctrine\Common\Cli\Configuration;
-use Doctrine\Common\Cli\CliController;
+use Doctrine\Common\CLI\Configuration;
+use Doctrine\Common\CLI\CliController;
 
 require_once __DIR__ . '/../../TestInit.php';
 
 /**
  * @author Nils Adermann <naderman@naderman.de>
  */
-class CliControllerTest extends \Doctrine\Tests\DoctrineTestCase
+class CLIControllerTest extends \Doctrine\Tests\DoctrineTestCase
 {
     private $cli;
 
     /**
-     * Sets up a CliController instance with a task referencing the TaskMock
-     * class. Instances of that class created by the CliController can be
+     * Sets up a CLIController instance with a task referencing the TaskMock
+     * class. Instances of that class created by the CLIController can be
      * inspected for correctness.
      */
     function setUp()
     {
-        $config = $this->getMock('\Doctrine\Common\Cli\Configuration');
-        $printer = $this->getMockForAbstractClass('\Doctrine\Common\Cli\Printers\AbstractPrinter');
+        $config = $this->getMock('\Doctrine\Common\CLI\Configuration');
+        $printer = $this->getMockForAbstractClass('\Doctrine\Common\CLI\Printers\AbstractPrinter');
 
-        $this->cli = new CliController($config, $printer);
+        $this->cli = new CLIController($config, $printer);
 
         TaskMock::$instances = array();
 
@@ -36,7 +36,7 @@ class CliControllerTest extends \Doctrine\Tests\DoctrineTestCase
      * Data provider with a bunch of task-mock calls with different arguments
      * and their expected parsed format.
      */
-    static public function dataCliControllerArguments()
+    static public function dataCLIControllerArguments()
     {
         return array(
             array(
@@ -69,9 +69,9 @@ class CliControllerTest extends \Doctrine\Tests\DoctrineTestCase
 
     /**
      * Checks whether the arguments coming from the data provider are correctly
-     * parsed by the CliController and passed to the task to be run.
+     * parsed by the CLIController and passed to the task to be run.
      *
-     * @dataProvider dataCliControllerArguments
+     * @dataProvider dataCLIControllerArguments
      * @param array $rawArgs
      * @param array $parsedArgs
      * @param string $message
diff --git a/tests/Doctrine/Tests/Common/Cli/ConfigurationTest.php b/tests/Doctrine/Tests/Common/CLI/ConfigurationTest.php
similarity index 87%
rename from tests/Doctrine/Tests/Common/Cli/ConfigurationTest.php
rename to tests/Doctrine/Tests/Common/CLI/ConfigurationTest.php
index 8e55ea5f1..0d9e9d9b2 100644
--- a/tests/Doctrine/Tests/Common/Cli/ConfigurationTest.php
+++ b/tests/Doctrine/Tests/Common/CLI/ConfigurationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Doctrine\Tests\Common\Cli;
+namespace Doctrine\Tests\Common\CLI;
 
-use Doctrine\Common\Cli\Configuration;
+use Doctrine\Common\CLI\Configuration;
 
 require_once __DIR__ . '/../../TestInit.php';
 
diff --git a/tests/Doctrine/Tests/Common/Cli/OptionGroupTest.php b/tests/Doctrine/Tests/Common/CLI/OptionGroupTest.php
similarity index 96%
rename from tests/Doctrine/Tests/Common/Cli/OptionGroupTest.php
rename to tests/Doctrine/Tests/Common/CLI/OptionGroupTest.php
index a91b3ebd4..fcd55f9fe 100644
--- a/tests/Doctrine/Tests/Common/Cli/OptionGroupTest.php
+++ b/tests/Doctrine/Tests/Common/CLI/OptionGroupTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Doctrine\Tests\Common\Cli;
+namespace Doctrine\Tests\Common\CLI;
 
-use Doctrine\Common\Cli\Printers\NormalPrinter,
-    Doctrine\Common\Cli\OptionGroup,
-    Doctrine\Common\Cli\Option;
+use Doctrine\Common\CLI\Printers\NormalPrinter,
+    Doctrine\Common\CLI\OptionGroup,
+    Doctrine\Common\CLI\Option;
 
 require_once __DIR__ . '/../../TestInit.php';
 
diff --git a/tests/Doctrine/Tests/Common/Cli/OptionTest.php b/tests/Doctrine/Tests/Common/CLI/OptionTest.php
similarity index 93%
rename from tests/Doctrine/Tests/Common/Cli/OptionTest.php
rename to tests/Doctrine/Tests/Common/CLI/OptionTest.php
index cbeff4b82..d6f68a928 100644
--- a/tests/Doctrine/Tests/Common/Cli/OptionTest.php
+++ b/tests/Doctrine/Tests/Common/CLI/OptionTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Doctrine\Tests\Common\Cli;
+namespace Doctrine\Tests\Common\CLI;
 
-use Doctrine\Common\Cli\Option;
+use Doctrine\Common\CLI\Option;
 
 require_once __DIR__ . '/../../TestInit.php';
 
diff --git a/tests/Doctrine/Tests/Common/Cli/StyleTest.php b/tests/Doctrine/Tests/Common/CLI/StyleTest.php
similarity index 86%
rename from tests/Doctrine/Tests/Common/Cli/StyleTest.php
rename to tests/Doctrine/Tests/Common/CLI/StyleTest.php
index 730cd1bb0..cdc956b5a 100644
--- a/tests/Doctrine/Tests/Common/Cli/StyleTest.php
+++ b/tests/Doctrine/Tests/Common/CLI/StyleTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Doctrine\Tests\Common\Cli;
+namespace Doctrine\Tests\Common\CLI;
 
-use Doctrine\Common\Cli\Style;
+use Doctrine\Common\CLI\Style;
 
 require_once __DIR__ . '/../../TestInit.php';
 
diff --git a/tools/sandbox/cli-config.php b/tools/sandbox/cli-config.php
index 6698e3a90..06cb51f07 100644
--- a/tools/sandbox/cli-config.php
+++ b/tools/sandbox/cli-config.php
@@ -37,5 +37,5 @@ $connectionOptions = array(
 
 $em = \Doctrine\ORM\EntityManager::create($connectionOptions, $config);
 
-$configuration = new \Doctrine\Common\Cli\Configuration();
+$configuration = new \Doctrine\Common\CLI\Configuration();
 $configuration->setAttribute('em', $em);
\ No newline at end of file
diff --git a/tools/sandbox/doctrine.php b/tools/sandbox/doctrine.php
index 536a78554..9b29b5e49 100644
--- a/tools/sandbox/doctrine.php
+++ b/tools/sandbox/doctrine.php
@@ -8,5 +8,5 @@ $classLoader->register();
 // Variable $configuration is defined inside cli-config.php
 require __DIR__ . '/cli-config.php';
 
-$cli = new \Doctrine\Common\Cli\CliController($configuration);
+$cli = new \Doctrine\Common\CLI\CLIController($configuration);
 $cli->run($_SERVER['argv']);
\ No newline at end of file