diff --git a/app/Console/Base.php b/app/Console/BaseCommand.php
similarity index 97%
rename from app/Console/Base.php
rename to app/Console/BaseCommand.php
index 25d48e442..bf86ae0d4 100644
--- a/app/Console/Base.php
+++ b/app/Console/BaseCommand.php
@@ -25,7 +25,7 @@ use Symfony\Component\Console\Command\Command;
  * @property \Kanboard\Model\UserNotificationFilter                     $userNotificationFilter
  * @property \Symfony\Component\EventDispatcher\EventDispatcher         $dispatcher
  */
-abstract class Base extends Command
+abstract class BaseCommand extends Command
 {
     /**
      * Container instance
diff --git a/app/Console/Cronjob.php b/app/Console/CronjobCommand.php
similarity index 95%
rename from app/Console/Cronjob.php
rename to app/Console/CronjobCommand.php
index 3a5c5596b..dae13af94 100644
--- a/app/Console/Cronjob.php
+++ b/app/Console/CronjobCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\NullOutput;
 
-class Cronjob extends Base
+class CronjobCommand extends BaseCommand
 {
     private $commands = array(
         'projects:daily-stats',
diff --git a/app/Console/LocaleComparator.php b/app/Console/LocaleComparatorCommand.php
similarity index 97%
rename from app/Console/LocaleComparator.php
rename to app/Console/LocaleComparatorCommand.php
index 8e5e09047..de83714f1 100644
--- a/app/Console/LocaleComparator.php
+++ b/app/Console/LocaleComparatorCommand.php
@@ -7,7 +7,7 @@ use RecursiveDirectoryIterator;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class LocaleComparator extends Base
+class LocaleComparatorCommand extends BaseCommand
 {
     const REF_LOCALE = 'fr_FR';
 
diff --git a/app/Console/LocaleSync.php b/app/Console/LocaleSyncCommand.php
similarity index 97%
rename from app/Console/LocaleSync.php
rename to app/Console/LocaleSyncCommand.php
index d62b40b51..11cfbde09 100644
--- a/app/Console/LocaleSync.php
+++ b/app/Console/LocaleSyncCommand.php
@@ -6,7 +6,7 @@ use DirectoryIterator;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class LocaleSync extends Base
+class LocaleSyncCommand extends BaseCommand
 {
     const REF_LOCALE = 'fr_FR';
 
diff --git a/app/Console/ProjectDailyColumnStatsExport.php b/app/Console/ProjectDailyColumnStatsExportCommand.php
similarity index 94%
rename from app/Console/ProjectDailyColumnStatsExport.php
rename to app/Console/ProjectDailyColumnStatsExportCommand.php
index 2513fbf14..ced1a374b 100644
--- a/app/Console/ProjectDailyColumnStatsExport.php
+++ b/app/Console/ProjectDailyColumnStatsExportCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class ProjectDailyColumnStatsExport extends Base
+class ProjectDailyColumnStatsExportCommand extends BaseCommand
 {
     protected function configure()
     {
diff --git a/app/Console/ProjectDailyStatsCalculation.php b/app/Console/ProjectDailyStatsCalculationCommand.php
similarity index 92%
rename from app/Console/ProjectDailyStatsCalculation.php
rename to app/Console/ProjectDailyStatsCalculationCommand.php
index 9884cc1c6..5b898f02e 100644
--- a/app/Console/ProjectDailyStatsCalculation.php
+++ b/app/Console/ProjectDailyStatsCalculationCommand.php
@@ -6,7 +6,7 @@ use Kanboard\Model\Project;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class ProjectDailyStatsCalculation extends Base
+class ProjectDailyStatsCalculationCommand extends BaseCommand
 {
     protected function configure()
     {
diff --git a/app/Console/SubtaskExport.php b/app/Console/SubtaskExportCommand.php
similarity index 95%
rename from app/Console/SubtaskExport.php
rename to app/Console/SubtaskExportCommand.php
index aaa95276a..986af1a44 100644
--- a/app/Console/SubtaskExport.php
+++ b/app/Console/SubtaskExportCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class SubtaskExport extends Base
+class SubtaskExportCommand extends BaseCommand
 {
     protected function configure()
     {
diff --git a/app/Console/TaskExport.php b/app/Console/TaskExportCommand.php
similarity index 95%
rename from app/Console/TaskExport.php
rename to app/Console/TaskExportCommand.php
index 4515bf959..789245bcb 100644
--- a/app/Console/TaskExport.php
+++ b/app/Console/TaskExportCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class TaskExport extends Base
+class TaskExportCommand extends BaseCommand
 {
     protected function configure()
     {
diff --git a/app/Console/TaskOverdueNotification.php b/app/Console/TaskOverdueNotificationCommand.php
similarity index 98%
rename from app/Console/TaskOverdueNotification.php
rename to app/Console/TaskOverdueNotificationCommand.php
index 43be4df8a..7d176ab1a 100644
--- a/app/Console/TaskOverdueNotification.php
+++ b/app/Console/TaskOverdueNotificationCommand.php
@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class TaskOverdueNotification extends Base
+class TaskOverdueNotificationCommand extends BaseCommand
 {
     protected function configure()
     {
diff --git a/app/Console/TaskTrigger.php b/app/Console/TaskTriggerCommand.php
similarity index 96%
rename from app/Console/TaskTrigger.php
rename to app/Console/TaskTriggerCommand.php
index 8d707211c..9e9554f93 100644
--- a/app/Console/TaskTrigger.php
+++ b/app/Console/TaskTriggerCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Kanboard\Model\Task;
 use Kanboard\Event\TaskListEvent;
 
-class TaskTrigger extends Base
+class TaskTriggerCommand extends BaseCommand
 {
     protected function configure()
     {
diff --git a/app/Console/TransitionExport.php b/app/Console/TransitionExportCommand.php
similarity index 95%
rename from app/Console/TransitionExport.php
rename to app/Console/TransitionExportCommand.php
index d9f805a45..265757b37 100644
--- a/app/Console/TransitionExport.php
+++ b/app/Console/TransitionExportCommand.php
@@ -7,7 +7,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class TransitionExport extends Base
+class TransitionExportCommand extends BaseCommand
 {
     protected function configure()
     {
diff --git a/kanboard b/kanboard
index 5046181d1..8ac49d792 100755
--- a/kanboard
+++ b/kanboard
@@ -5,28 +5,28 @@ require __DIR__.'/app/common.php';
 
 use Symfony\Component\Console\Application;
 use Symfony\Component\EventDispatcher\Event;
-use Kanboard\Console\TaskOverdueNotification;
-use Kanboard\Console\SubtaskExport;
-use Kanboard\Console\TaskExport;
-use Kanboard\Console\ProjectDailyStatsCalculation;
-use Kanboard\Console\ProjectDailyColumnStatsExport;
-use Kanboard\Console\TransitionExport;
-use Kanboard\Console\LocaleSync;
-use Kanboard\Console\LocaleComparator;
-use Kanboard\Console\TaskTrigger;
-use Kanboard\Console\Cronjob;
+use Kanboard\Console\TaskOverdueNotificationCommand;
+use Kanboard\Console\SubtaskExportCommand;
+use Kanboard\Console\TaskExportCommand;
+use Kanboard\Console\ProjectDailyStatsCalculationCommand;
+use Kanboard\Console\ProjectDailyColumnStatsExportCommand;
+use Kanboard\Console\TransitionExportCommand;
+use Kanboard\Console\LocaleSyncCommand;
+use Kanboard\Console\LocaleComparatorCommand;
+use Kanboard\Console\TaskTriggerCommand;
+use Kanboard\Console\CronjobCommand;
 
 $container['dispatcher']->dispatch('app.bootstrap', new Event);
 
 $application = new Application('Kanboard', APP_VERSION);
-$application->add(new TaskOverdueNotification($container));
-$application->add(new SubtaskExport($container));
-$application->add(new TaskExport($container));
-$application->add(new ProjectDailyStatsCalculation($container));
-$application->add(new ProjectDailyColumnStatsExport($container));
-$application->add(new TransitionExport($container));
-$application->add(new LocaleSync($container));
-$application->add(new LocaleComparator($container));
-$application->add(new TaskTrigger($container));
-$application->add(new Cronjob($container));
+$application->add(new TaskOverdueNotificationCommand($container));
+$application->add(new SubtaskExportCommand($container));
+$application->add(new TaskExportCommand($container));
+$application->add(new ProjectDailyStatsCalculationCommand($container));
+$application->add(new ProjectDailyColumnStatsExportCommand($container));
+$application->add(new TransitionExportCommand($container));
+$application->add(new LocaleSyncCommand($container));
+$application->add(new LocaleComparatorCommand($container));
+$application->add(new TaskTriggerCommand($container));
+$application->add(new CronjobCommand($container));
 $application->run();