diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php
index 725d2bf83..0e6936ac2 100644
--- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php
+++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php
@@ -101,7 +101,7 @@ class ConvertDoctrine1SchemaCommand extends Command
     protected function configure()
     {
         $this
-        ->setName('orm:convert-d1-schema')
+        ->setName('orm:convert:d1-schema')
         ->setDescription('Converts Doctrine 1.X schema into a Doctrine 2.X schema.')
         ->setDefinition(array(
             new InputArgument(
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php
index 020a4afaf..039843614 100644
--- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php
+++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php
@@ -48,7 +48,7 @@ class ConvertMappingCommand extends Command
     protected function configure()
     {
         $this
-        ->setName('orm:convert-mapping')
+        ->setName('orm:convert:mapping')
         ->setDescription('Convert mapping information between supported formats.')
         ->setDefinition(array(
             new InputOption(
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php
index 764e89500..7cdce30e0 100644
--- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php
+++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php
@@ -46,7 +46,7 @@ class GenerateEntitiesCommand extends Command
     protected function configure()
     {
         $this
-        ->setName('orm:generate-entities')
+        ->setName('orm:generate:entities')
         ->setDescription('Generate entity classes and method stubs from your mapping information.')
         ->setDefinition(array(
             new InputOption(
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php
index 1de9dd7dc..77e414d3d 100644
--- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php
+++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php
@@ -44,7 +44,7 @@ class GenerateProxiesCommand extends Command
     protected function configure()
     {
         $this
-        ->setName('orm:generate-proxies')
+        ->setName('orm:generate:proxies')
         ->setDescription('Generates proxy classes for entity classes.')
         ->setDefinition(array(
             new InputOption(
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php
index 7d1bd4c04..fdb88d2d1 100644
--- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php
+++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php
@@ -45,7 +45,7 @@ class GenerateRepositoriesCommand extends Command
     protected function configure()
     {
         $this
-        ->setName('orm:generate-repositories')
+        ->setName('orm:generate:repositories')
         ->setDescription('Generate repository classes from your mapping information.')
         ->setDefinition(array(
             new InputOption(