diff --git a/lib/Alchemy/Phrasea/Command/Task/SchedulerStart.php b/lib/Alchemy/Phrasea/Command/Task/SchedulerStart.php
index 7347eb25f0..df02e2d64d 100644
--- a/lib/Alchemy/Phrasea/Command/Task/SchedulerStart.php
+++ b/lib/Alchemy/Phrasea/Command/Task/SchedulerStart.php
@@ -20,8 +20,8 @@ class SchedulerStart extends Command
 {
     public function __construct()
     {
-        parent::__construct('scheduler:start');
-        $this->setDescription('Starts Phraseanet scheduler');
+        parent::__construct('task-manager:scheduler:start');
+        $this->setDescription('Starts Task-Manager scheduler');
     }
 
     protected function doExecute(InputInterface $input, OutputInterface $output)
diff --git a/lib/Alchemy/Phrasea/Command/Task/SchedulerState.php b/lib/Alchemy/Phrasea/Command/Task/SchedulerState.php
index 41a3fc5033..fc7ed7de6e 100644
--- a/lib/Alchemy/Phrasea/Command/Task/SchedulerState.php
+++ b/lib/Alchemy/Phrasea/Command/Task/SchedulerState.php
@@ -21,9 +21,9 @@ class SchedulerState extends Command
 {
     public function __construct()
     {
-        parent::__construct('scheduler:state');
+        parent::__construct('task-manager:scheduler:state');
         $this
-            ->setDescription('Returns Phraseanet scheduler status')
+            ->setDescription('Returns Task-Manager scheduler state')
             ->addOption('short', null, InputOption::VALUE_NONE, 'print short result, ie: <info>stopped()</info> | <info>started(12345)</info> | <info>tostop(12345)</info> | <info>stopping(12345)</info>');
     }
 
diff --git a/lib/Alchemy/Phrasea/Command/Task/SchedulerStop.php b/lib/Alchemy/Phrasea/Command/Task/SchedulerStop.php
index e589d64722..d18dda2813 100644
--- a/lib/Alchemy/Phrasea/Command/Task/SchedulerStop.php
+++ b/lib/Alchemy/Phrasea/Command/Task/SchedulerStop.php
@@ -20,8 +20,8 @@ class SchedulerStop extends Command
 {
     public function __construct()
     {
-        parent::__construct('scheduler:stop');
-        $this->setDescription('Starts Phraseanet scheduler');
+        parent::__construct('task-manager:scheduler:stop');
+        $this->setDescription('Starts Task-Manager scheduler. It updates the scheduler configuration.');
     }
 
     protected function doExecute(InputInterface $input, OutputInterface $output)
diff --git a/lib/Alchemy/Phrasea/Command/Task/TaskList.php b/lib/Alchemy/Phrasea/Command/Task/TaskList.php
index 0f3c97aeff..5531f2213c 100644
--- a/lib/Alchemy/Phrasea/Command/Task/TaskList.php
+++ b/lib/Alchemy/Phrasea/Command/Task/TaskList.php
@@ -20,7 +20,7 @@ class TaskList extends Command
 {
     public function __construct()
     {
-        parent::__construct('task:list');
+        parent::__construct('task-manager:task:list');
     }
 
     protected function doExecute(InputInterface $input, OutputInterface $output)
diff --git a/lib/Alchemy/Phrasea/Command/Task/TaskManagerCommand.php b/lib/Alchemy/Phrasea/Command/Task/TaskManagerCommand.php
index 8f2dd6b96e..fa14a91b0b 100644
--- a/lib/Alchemy/Phrasea/Command/Task/TaskManagerCommand.php
+++ b/lib/Alchemy/Phrasea/Command/Task/TaskManagerCommand.php
@@ -22,7 +22,7 @@ class TaskManagerCommand extends Command
 {
     public function __construct()
     {
-        parent::__construct('task-manager:run');
+        parent::__construct('task-manager:scheduler:run');
     }
 
     public function signalHandler($signal)
diff --git a/lib/Alchemy/Phrasea/Command/Task/TaskRun.php b/lib/Alchemy/Phrasea/Command/Task/TaskRun.php
index e5c99f493c..535c5ed963 100644
--- a/lib/Alchemy/Phrasea/Command/Task/TaskRun.php
+++ b/lib/Alchemy/Phrasea/Command/Task/TaskRun.php
@@ -29,7 +29,7 @@ class TaskRun extends Command
 {
     public function __construct()
     {
-        parent::__construct('task:run');
+        parent::__construct('task-manager:task:run');
 
         $this->addArgument('task_id', InputArgument::REQUIRED, 'The id of the task to run', null)
             ->addOption('max-memory', null, InputOption::VALUE_REQUIRED, '')
diff --git a/lib/Alchemy/Phrasea/Command/Task/TaskState.php b/lib/Alchemy/Phrasea/Command/Task/TaskState.php
index 8aa81b7937..ce1c2f1cb9 100644
--- a/lib/Alchemy/Phrasea/Command/Task/TaskState.php
+++ b/lib/Alchemy/Phrasea/Command/Task/TaskState.php
@@ -21,7 +21,7 @@ class TaskState extends Command
 {
     public function __construct()
     {
-        parent::__construct('task:state');
+        parent::__construct('task-manager:task:state');
 
         $this
             ->addArgument('task_id', InputArgument::REQUIRED, 'The task_id to test')