diff --git a/src/Generator/Commands/ActionGenerator.php b/src/Generator/Commands/ActionGenerator.php
index 3ba553a1..86fabbf0 100644
--- a/src/Generator/Commands/ActionGenerator.php
+++ b/src/Generator/Commands/ActionGenerator.php
@@ -24,7 +24,7 @@ class ActionGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:action';
+    protected $name = 'apiato:make:action';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/ConfigurationGenerator.php b/src/Generator/Commands/ConfigurationGenerator.php
index e5b84a7c..9bf683c7 100644
--- a/src/Generator/Commands/ConfigurationGenerator.php
+++ b/src/Generator/Commands/ConfigurationGenerator.php
@@ -19,7 +19,7 @@ class ConfigurationGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:configuration';
+    protected $name = 'apiato:make:configuration';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/ContainerApiGenerator.php b/src/Generator/Commands/ContainerApiGenerator.php
index 3f4e9fa6..4216d6b3 100644
--- a/src/Generator/Commands/ContainerApiGenerator.php
+++ b/src/Generator/Commands/ContainerApiGenerator.php
@@ -30,7 +30,7 @@ class ContainerApiGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:container:api';
+    protected $name = 'apiato:make:container:api';
     /**
      * The console command description.
      *
@@ -68,21 +68,21 @@ public function getUserInputs(): array|null
         $models = Pluralizer::plural($model);
 
         $this->printInfoMessage('Generating README File');
-        $this->call('apiato:generate:readme', [
+        $this->call('apiato:make:readme', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => 'README',
         ]);
 
         $this->printInfoMessage('Generating Configuration File');
-        $this->call('apiato:generate:configuration', [
+        $this->call('apiato:make:configuration', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => Str::camel($this->sectionName) . '-' . Str::camel($this->containerName),
         ]);
 
         $this->printInfoMessage('Generating Model and Repository');
-        $this->call('apiato:generate:model', [
+        $this->call('apiato:make:model', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => $model,
@@ -90,7 +90,7 @@ public function getUserInputs(): array|null
         ]);
 
         $this->printInfoMessage('Generating a basic Migration file');
-        $this->call('apiato:generate:migration', [
+        $this->call('apiato:make:migration', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => 'create_' . Str::snake($models) . '_table',
@@ -98,7 +98,7 @@ public function getUserInputs(): array|null
         ]);
 
         $this->printInfoMessage('Generating Transformer for the Model');
-        $this->call('apiato:generate:transformer', [
+        $this->call('apiato:make:transformer', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => $containerName . 'Transformer',
@@ -107,7 +107,7 @@ public function getUserInputs(): array|null
         ]);
 
         $this->printInfoMessage('Generating Factory for the Model');
-        $this->call('apiato:generate:factory', [
+        $this->call('apiato:make:factory', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => $containerName . 'Factory',
@@ -247,7 +247,7 @@ public function getUserInputs(): array|null
         ];
 
         foreach ($routes as $route) {
-            $this->call('apiato:generate:request', [
+            $this->call('apiato:make:request', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => $route['request'],
@@ -255,7 +255,7 @@ public function getUserInputs(): array|null
                 '--stub' => $route['stub'],
             ]);
 
-            $this->call('apiato:generate:action', [
+            $this->call('apiato:make:action', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => $route['action'],
@@ -264,7 +264,7 @@ public function getUserInputs(): array|null
                 '--stub' => $route['stub'],
             ]);
 
-            $this->call('apiato:generate:task', [
+            $this->call('apiato:make:task', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => $route['task'],
@@ -274,7 +274,7 @@ public function getUserInputs(): array|null
             ]);
 
             if ($generateEvents) {
-                $this->call('apiato:generate:event', [
+                $this->call('apiato:make:event', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['event'],
@@ -286,7 +286,7 @@ public function getUserInputs(): array|null
             }
 
             if ($generateTests) {
-                $this->call('apiato:generate:test:unit', [
+                $this->call('apiato:make:test:unit', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['unittest']['task']['filename'],
@@ -297,7 +297,7 @@ public function getUserInputs(): array|null
                     '--event' => $generateEvents ? $route['event'] : false,
                 ]);
 
-                $this->call('apiato:generate:test:unit', [
+                $this->call('apiato:make:test:unit', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $model . 'FactoryTest',
@@ -307,7 +307,7 @@ public function getUserInputs(): array|null
                     '--event' => false,
                 ]);
 
-                $this->call('apiato:generate:test:unit', [
+                $this->call('apiato:make:test:unit', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $models . 'MigrationTest',
@@ -319,7 +319,7 @@ public function getUserInputs(): array|null
                     '--tablename' => Str::snake(Pluralizer::plural($containerName)),
                 ]);
 
-                $this->call('apiato:generate:test:functional', [
+                $this->call('apiato:make:test:functional', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['functionaltest'],
@@ -331,7 +331,7 @@ public function getUserInputs(): array|null
             }
 
             if ('sac' === $controllertype) {
-                $this->call('apiato:generate:route', [
+                $this->call('apiato:make:route', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['name'],
@@ -344,7 +344,7 @@ public function getUserInputs(): array|null
                     '--controller' => $route['controller'],
                 ]);
 
-                $this->call('apiato:generate:controller', [
+                $this->call('apiato:make:controller', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['controller'],
@@ -353,7 +353,7 @@ public function getUserInputs(): array|null
                     '--stub' => $route['stub'],
                 ]);
             } else {
-                $this->call('apiato:generate:route', [
+                $this->call('apiato:make:route', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['name'],
@@ -370,7 +370,7 @@ public function getUserInputs(): array|null
 
         if ('mac' === $controllertype) {
             $this->printInfoMessage('Generating Controller to wire everything together');
-            $this->call('apiato:generate:controller', [
+            $this->call('apiato:make:controller', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--model' => $model,
@@ -387,7 +387,7 @@ public function getUserInputs(): array|null
                 foreach ($events as $event) {
                     $listener = $event . 'Listener';
                     $listeners[$listener] = [$event];
-                    $this->call('apiato:generate:listener', [
+                    $this->call('apiato:make:listener', [
                         '--section' => $this->sectionName,
                         '--container' => $this->containerName,
                         '--file' => $listener,
@@ -402,7 +402,7 @@ public function getUserInputs(): array|null
             }
 
             $this->printInfoMessage('Generating EventServiceProvider');
-            $this->call('apiato:generate:provider', [
+            $this->call('apiato:make:provider', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => 'EventServiceProvider',
@@ -411,7 +411,7 @@ public function getUserInputs(): array|null
             ]);
 
             $this->printInfoMessage('Generating MainServiceProvider');
-            $this->call('apiato:generate:provider', [
+            $this->call('apiato:make:provider', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => 'MainServiceProvider',
@@ -420,7 +420,7 @@ public function getUserInputs(): array|null
             ]);
         } else {
             $this->printInfoMessage('Generating MainServiceProvider');
-            $this->call('apiato:generate:provider', [
+            $this->call('apiato:make:provider', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => 'MainServiceProvider',
diff --git a/src/Generator/Commands/ContainerGenerator.php b/src/Generator/Commands/ContainerGenerator.php
index 08c40117..19a2c399 100644
--- a/src/Generator/Commands/ContainerGenerator.php
+++ b/src/Generator/Commands/ContainerGenerator.php
@@ -25,7 +25,7 @@ class ContainerGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:container';
+    protected $name = 'apiato:make:container';
     /**
      * The console command description.
      *
@@ -63,43 +63,43 @@ public function getUserInputs(): array|null
         }
         $generateTests = $this->checkParameterOrConfirm('tests', 'Do you want to generate the corresponding Tests for this Container?', true);
         if ($generateTests) {
-            $this->call('apiato:generate:test:testcase', [
+            $this->call('apiato:make:test:testcase', [
                 '--section' => $this->sectionName,
                 '--container' => $this->containerName,
                 '--file' => 'TestCase',
                 '--type' => 'container',
             ]);
-            $this->call('apiato:generate:test:testcase', [
+            $this->call('apiato:make:test:testcase', [
                 '--section' => $this->sectionName,
                 '--container' => $this->containerName,
                 '--file' => 'TestCase',
                 '--type' => 'unit',
             ]);
-            $this->call('apiato:generate:test:testcase', [
+            $this->call('apiato:make:test:testcase', [
                 '--section' => $this->sectionName,
                 '--container' => $this->containerName,
                 '--file' => 'TestCase',
                 '--type' => 'functional',
             ]);
-            // $this->call('apiato:generate:test:testcase', [
+            // $this->call('apiato:make:test:testcase', [
             //     '--section' => $this->sectionName,
             //     '--container' => $this->containerName,
             //     '--file' => 'TestCase',
             //     '--type' => 'e2e',
             // ]);
-            $this->call('apiato:generate:test:testcase', [
+            $this->call('apiato:make:test:testcase', [
                 '--section' => $this->sectionName,
                 '--container' => $this->containerName,
                 '--file' => 'TestCase',
                 '--type' => 'api',
             ]);
-            // $this->call('apiato:generate:test:testcase', [
+            // $this->call('apiato:make:test:testcase', [
             //     '--section' => $this->sectionName,
             //     '--container' => $this->containerName,
             //     '--file' => 'TestCase',
             //     '--type' => 'cli',
             // ]);
-            // $this->call('apiato:generate:test:testcase', [
+            // $this->call('apiato:make:test:testcase', [
             //     '--section' => $this->sectionName,
             //     '--container' => $this->containerName,
             //     '--file' => 'TestCase',
@@ -113,7 +113,7 @@ public function getUserInputs(): array|null
         $_sectionName = Str::lower($this->sectionName);
 
         if ('api' === $ui || 'both' === $ui) {
-            $this->call('apiato:generate:container:api', [
+            $this->call('apiato:make:container:api', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => 'composer',
@@ -126,7 +126,7 @@ public function getUserInputs(): array|null
         }
 
         if ('web' === $ui || 'both' === $ui) {
-            $this->call('apiato:generate:container:web', [
+            $this->call('apiato:make:container:web', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => 'composer',
diff --git a/src/Generator/Commands/ContainerWebGenerator.php b/src/Generator/Commands/ContainerWebGenerator.php
index 6110e0c6..2450f05d 100644
--- a/src/Generator/Commands/ContainerWebGenerator.php
+++ b/src/Generator/Commands/ContainerWebGenerator.php
@@ -24,7 +24,7 @@ class ContainerWebGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:container:web';
+    protected $name = 'apiato:make:container:web';
     /**
      * The console command description.
      *
@@ -62,21 +62,21 @@ public function getUserInputs(): array|null
         $models = Pluralizer::plural($model);
 
         $this->printInfoMessage('Generating README File');
-        $this->call('apiato:generate:readme', [
+        $this->call('apiato:make:readme', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => 'README',
         ]);
 
         $this->printInfoMessage('Generating Configuration File');
-        $this->call('apiato:generate:configuration', [
+        $this->call('apiato:make:configuration', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => Str::camel($this->sectionName) . '-' . Str::camel($this->containerName),
         ]);
 
         $this->printInfoMessage('Generating MainServiceProvider');
-        $this->call('apiato:generate:provider', [
+        $this->call('apiato:make:provider', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => 'MainServiceProvider',
@@ -84,7 +84,7 @@ public function getUserInputs(): array|null
         ]);
 
         $this->printInfoMessage('Generating Model and Repository');
-        $this->call('apiato:generate:model', [
+        $this->call('apiato:make:model', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => $model,
@@ -92,7 +92,7 @@ public function getUserInputs(): array|null
         ]);
 
         $this->printInfoMessage('Generating a basic Migration file');
-        $this->call('apiato:generate:migration', [
+        $this->call('apiato:make:migration', [
             '--section' => $sectionName,
             '--container' => $containerName,
             '--file' => 'create_' . Str::snake($models) . '_table',
@@ -194,7 +194,7 @@ public function getUserInputs(): array|null
         ];
 
         foreach ($routes as $route) {
-            $this->call('apiato:generate:request', [
+            $this->call('apiato:make:request', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => $route['request'],
@@ -203,7 +203,7 @@ public function getUserInputs(): array|null
             ]);
 
             if (null != $route['action']) {
-                $this->call('apiato:generate:action', [
+                $this->call('apiato:make:action', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['action'],
@@ -214,7 +214,7 @@ public function getUserInputs(): array|null
             }
 
             if (null != $route['task']) {
-                $this->call('apiato:generate:task', [
+                $this->call('apiato:make:task', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['task'],
@@ -224,7 +224,7 @@ public function getUserInputs(): array|null
             }
 
             if ('sac' === $controllertype) {
-                $this->call('apiato:generate:route', [
+                $this->call('apiato:make:route', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['name'],
@@ -237,7 +237,7 @@ public function getUserInputs(): array|null
                     '--controller' => $route['controller'],
                 ]);
 
-                $this->call('apiato:generate:controller', [
+                $this->call('apiato:make:controller', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['controller'],
@@ -246,7 +246,7 @@ public function getUserInputs(): array|null
                     '--stub' => $route['stub'],
                 ]);
             } else {
-                $this->call('apiato:generate:route', [
+                $this->call('apiato:make:route', [
                     '--section' => $sectionName,
                     '--container' => $containerName,
                     '--file' => $route['name'],
@@ -263,7 +263,7 @@ public function getUserInputs(): array|null
 
         if ('mac' === $controllertype) {
             $this->printInfoMessage('Generating Controller to wire everything together');
-            $this->call('apiato:generate:controller', [
+            $this->call('apiato:make:controller', [
                 '--section' => $sectionName,
                 '--container' => $containerName,
                 '--file' => 'Controller',
diff --git a/src/Generator/Commands/ControllerGenerator.php b/src/Generator/Commands/ControllerGenerator.php
index df448f93..4cdff172 100644
--- a/src/Generator/Commands/ControllerGenerator.php
+++ b/src/Generator/Commands/ControllerGenerator.php
@@ -25,7 +25,7 @@ class ControllerGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:controller';
+    protected $name = 'apiato:make:controller';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/EventGenerator.php b/src/Generator/Commands/EventGenerator.php
index 8413189d..b225bd74 100644
--- a/src/Generator/Commands/EventGenerator.php
+++ b/src/Generator/Commands/EventGenerator.php
@@ -23,7 +23,7 @@ class EventGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:event';
+    protected $name = 'apiato:make:event';
     /**
      * The console command description.
      *
@@ -54,7 +54,7 @@ public function getUserInputs(): array|null
         if (is_null($listener)) {
             $listener = $this->checkParameterOrConfirm('listener', 'Do you want to generate a Listener for this Event?', false);
             if ($listener) {
-                $this->call('apiato:generate:listener', [
+                $this->call('apiato:make:listener', [
                     '--section' => $this->sectionName,
                     '--container' => $this->containerName,
                     '--file' => $this->fileName . 'Listener',
diff --git a/src/Generator/Commands/EventListenerGenerator.php b/src/Generator/Commands/EventListenerGenerator.php
index 2df13fd1..f3c90d91 100644
--- a/src/Generator/Commands/EventListenerGenerator.php
+++ b/src/Generator/Commands/EventListenerGenerator.php
@@ -20,7 +20,7 @@ class EventListenerGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:listener';
+    protected $name = 'apiato:make:listener';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/ExceptionGenerator.php b/src/Generator/Commands/ExceptionGenerator.php
index 4bda7a59..59ef3179 100644
--- a/src/Generator/Commands/ExceptionGenerator.php
+++ b/src/Generator/Commands/ExceptionGenerator.php
@@ -19,7 +19,7 @@ class ExceptionGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:exception';
+    protected $name = 'apiato:make:exception';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/FunctionalTestGenerator.php b/src/Generator/Commands/FunctionalTestGenerator.php
index 44ba64b2..3fa1b498 100644
--- a/src/Generator/Commands/FunctionalTestGenerator.php
+++ b/src/Generator/Commands/FunctionalTestGenerator.php
@@ -24,7 +24,7 @@ class FunctionalTestGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:test:functional';
+    protected $name = 'apiato:make:test:functional';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/JobGenerator.php b/src/Generator/Commands/JobGenerator.php
index 844bbe15..eb0458f3 100644
--- a/src/Generator/Commands/JobGenerator.php
+++ b/src/Generator/Commands/JobGenerator.php
@@ -19,7 +19,7 @@ class JobGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:job';
+    protected $name = 'apiato:make:job';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/MailGenerator.php b/src/Generator/Commands/MailGenerator.php
index 37b78606..f3e14211 100644
--- a/src/Generator/Commands/MailGenerator.php
+++ b/src/Generator/Commands/MailGenerator.php
@@ -21,7 +21,7 @@ class MailGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:mail';
+    protected $name = 'apiato:make:mail';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/MiddlewareGenerator.php b/src/Generator/Commands/MiddlewareGenerator.php
index da15f789..879c59d9 100644
--- a/src/Generator/Commands/MiddlewareGenerator.php
+++ b/src/Generator/Commands/MiddlewareGenerator.php
@@ -19,7 +19,7 @@ class MiddlewareGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:middleware';
+    protected $name = 'apiato:make:middleware';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/MigrationGenerator.php b/src/Generator/Commands/MigrationGenerator.php
index 66dfe21c..c190f1f6 100644
--- a/src/Generator/Commands/MigrationGenerator.php
+++ b/src/Generator/Commands/MigrationGenerator.php
@@ -24,7 +24,7 @@ class MigrationGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:migration';
+    protected $name = 'apiato:make:migration';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/ModelFactoryGenerator.php b/src/Generator/Commands/ModelFactoryGenerator.php
index aac1677b..239380c3 100644
--- a/src/Generator/Commands/ModelFactoryGenerator.php
+++ b/src/Generator/Commands/ModelFactoryGenerator.php
@@ -21,7 +21,7 @@ class ModelFactoryGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:factory';
+    protected $name = 'apiato:make:factory';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/ModelGenerator.php b/src/Generator/Commands/ModelGenerator.php
index b643fe0b..ebad83fe 100644
--- a/src/Generator/Commands/ModelGenerator.php
+++ b/src/Generator/Commands/ModelGenerator.php
@@ -21,7 +21,7 @@ class ModelGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:model';
+    protected $name = 'apiato:make:model';
     /**
      * The console command description.
      *
@@ -51,7 +51,7 @@ public function getUserInputs(): array|null
         if ($repository) {
             // We need to generate a corresponding repository
             // so call the other command
-            $status = $this->call('apiato:generate:repository', [
+            $status = $this->call('apiato:make:repository', [
                 '--section' => $this->sectionName,
                 '--container' => $this->containerName,
                 '--file' => $this->fileName . 'Repository',
diff --git a/src/Generator/Commands/NotificationGenerator.php b/src/Generator/Commands/NotificationGenerator.php
index 325b3769..06862f85 100644
--- a/src/Generator/Commands/NotificationGenerator.php
+++ b/src/Generator/Commands/NotificationGenerator.php
@@ -19,7 +19,7 @@ class NotificationGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:notification';
+    protected $name = 'apiato:make:notification';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/PolicyGenerator.php b/src/Generator/Commands/PolicyGenerator.php
index 8ee7e47f..41bbab5d 100644
--- a/src/Generator/Commands/PolicyGenerator.php
+++ b/src/Generator/Commands/PolicyGenerator.php
@@ -19,7 +19,7 @@ class PolicyGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:policy';
+    protected $name = 'apiato:make:policy';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/ReadmeGenerator.php b/src/Generator/Commands/ReadmeGenerator.php
index c7016c79..ecfc0204 100644
--- a/src/Generator/Commands/ReadmeGenerator.php
+++ b/src/Generator/Commands/ReadmeGenerator.php
@@ -19,7 +19,7 @@ class ReadmeGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:readme';
+    protected $name = 'apiato:make:readme';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/RepositoryGenerator.php b/src/Generator/Commands/RepositoryGenerator.php
index f59aece3..d7ca606e 100644
--- a/src/Generator/Commands/RepositoryGenerator.php
+++ b/src/Generator/Commands/RepositoryGenerator.php
@@ -21,7 +21,7 @@ class RepositoryGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:repository';
+    protected $name = 'apiato:make:repository';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/RequestGenerator.php b/src/Generator/Commands/RequestGenerator.php
index 8799f6b2..b29d7058 100644
--- a/src/Generator/Commands/RequestGenerator.php
+++ b/src/Generator/Commands/RequestGenerator.php
@@ -23,7 +23,7 @@ class RequestGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:request';
+    protected $name = 'apiato:make:request';
 
     /**
      * The console command description.
diff --git a/src/Generator/Commands/RouteGenerator.php b/src/Generator/Commands/RouteGenerator.php
index 371e4e74..e905ac5e 100644
--- a/src/Generator/Commands/RouteGenerator.php
+++ b/src/Generator/Commands/RouteGenerator.php
@@ -27,7 +27,7 @@ class RouteGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:route';
+    protected $name = 'apiato:make:route';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/SeederGenerator.php b/src/Generator/Commands/SeederGenerator.php
index 937df03c..210983fc 100644
--- a/src/Generator/Commands/SeederGenerator.php
+++ b/src/Generator/Commands/SeederGenerator.php
@@ -19,7 +19,7 @@ class SeederGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:seeder';
+    protected $name = 'apiato:make:seeder';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/ServiceProviderGenerator.php b/src/Generator/Commands/ServiceProviderGenerator.php
index 221e2721..07859296 100644
--- a/src/Generator/Commands/ServiceProviderGenerator.php
+++ b/src/Generator/Commands/ServiceProviderGenerator.php
@@ -23,7 +23,7 @@ class ServiceProviderGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:provider';
+    protected $name = 'apiato:make:provider';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/SubActionGenerator.php b/src/Generator/Commands/SubActionGenerator.php
index 4424888d..ae8fdfb3 100644
--- a/src/Generator/Commands/SubActionGenerator.php
+++ b/src/Generator/Commands/SubActionGenerator.php
@@ -19,7 +19,7 @@ class SubActionGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:subaction';
+    protected $name = 'apiato:make:subaction';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/TaskGenerator.php b/src/Generator/Commands/TaskGenerator.php
index fe30419a..2459659e 100644
--- a/src/Generator/Commands/TaskGenerator.php
+++ b/src/Generator/Commands/TaskGenerator.php
@@ -24,7 +24,7 @@ class TaskGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:task';
+    protected $name = 'apiato:make:task';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/TestCaseGenerator.php b/src/Generator/Commands/TestCaseGenerator.php
index 80e14e84..c7a0abc4 100644
--- a/src/Generator/Commands/TestCaseGenerator.php
+++ b/src/Generator/Commands/TestCaseGenerator.php
@@ -21,7 +21,7 @@ class TestCaseGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:test:testcase';
+    protected $name = 'apiato:make:test:testcase';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/TransformerGenerator.php b/src/Generator/Commands/TransformerGenerator.php
index ac07147d..bd6bc4ab 100644
--- a/src/Generator/Commands/TransformerGenerator.php
+++ b/src/Generator/Commands/TransformerGenerator.php
@@ -23,7 +23,7 @@ class TransformerGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:transformer';
+    protected $name = 'apiato:make:transformer';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/UnitTestGenerator.php b/src/Generator/Commands/UnitTestGenerator.php
index 614a434e..53ca51d8 100644
--- a/src/Generator/Commands/UnitTestGenerator.php
+++ b/src/Generator/Commands/UnitTestGenerator.php
@@ -26,7 +26,7 @@ class UnitTestGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:test:unit';
+    protected $name = 'apiato:make:test:unit';
     /**
      * The console command description.
      *
diff --git a/src/Generator/Commands/ValueGenerator.php b/src/Generator/Commands/ValueGenerator.php
index adc84a14..0c994594 100644
--- a/src/Generator/Commands/ValueGenerator.php
+++ b/src/Generator/Commands/ValueGenerator.php
@@ -20,7 +20,7 @@ class ValueGenerator extends Generator implements ComponentsGenerator
      *
      * @var string
      */
-    protected $name = 'apiato:generate:value';
+    protected $name = 'apiato:make:value';
     /**
      * The console command description.
      *