diff --git a/src/Command.php b/src/Command.php
index 6ff67f4..0a28caf 100644
--- a/src/Command.php
+++ b/src/Command.php
@@ -60,7 +60,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $this->input = $input;
         $this->output = $output;
 
-        return (int) $this->fire();
+        return (int) $this->handle();
     }
 
     /**
diff --git a/src/Commands/ChangeSourceNamespaceCommand.php b/src/Commands/ChangeSourceNamespaceCommand.php
index 8e341b7..7a40dab 100644
--- a/src/Commands/ChangeSourceNamespaceCommand.php
+++ b/src/Commands/ChangeSourceNamespaceCommand.php
@@ -69,7 +69,7 @@ public function __construct()
     /**
      * Execute the console command.
      */
-    public function fire()
+    public function handle()
     {
         try {
             $this->setAppDirectoryNamespace();
diff --git a/src/Commands/ControllerMakeCommand.php b/src/Commands/ControllerMakeCommand.php
index 9beb084..83c4aac 100644
--- a/src/Commands/ControllerMakeCommand.php
+++ b/src/Commands/ControllerMakeCommand.php
@@ -54,7 +54,7 @@ class ControllerMakeCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         $generator = new ControllerGenerator();
 
diff --git a/src/Commands/FeatureDeleteCommand.php b/src/Commands/FeatureDeleteCommand.php
index d6739c9..75dffcd 100644
--- a/src/Commands/FeatureDeleteCommand.php
+++ b/src/Commands/FeatureDeleteCommand.php
@@ -53,7 +53,7 @@ class FeatureDeleteCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         try {
             $service = Str::service($this->argument('service'));
diff --git a/src/Commands/FeatureDescribeCommand.php b/src/Commands/FeatureDescribeCommand.php
index ca18a91..5a723c3 100644
--- a/src/Commands/FeatureDescribeCommand.php
+++ b/src/Commands/FeatureDescribeCommand.php
@@ -43,7 +43,7 @@ class FeatureDescribeCommand extends Command
       *
       * @return bool|null
       */
-     public function fire()
+     public function handle()
      {
          if ($feature = $this->findFeature($this->argument('feature'))) {
             $parser = new Parser();
diff --git a/src/Commands/FeatureMakeCommand.php b/src/Commands/FeatureMakeCommand.php
index e25c1ea..294a6de 100644
--- a/src/Commands/FeatureMakeCommand.php
+++ b/src/Commands/FeatureMakeCommand.php
@@ -54,7 +54,7 @@ class FeatureMakeCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         try {
             $service = studly_case($this->argument('service'));
diff --git a/src/Commands/FeaturesListCommand.php b/src/Commands/FeaturesListCommand.php
index 2c10663..41ebb18 100644
--- a/src/Commands/FeaturesListCommand.php
+++ b/src/Commands/FeaturesListCommand.php
@@ -43,7 +43,7 @@ class FeaturesListCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         foreach ($this->listFeatures($this->argument('service')) as $service => $features) {
             $this->comment("\n$service\n");
diff --git a/src/Commands/JobDeleteCommand.php b/src/Commands/JobDeleteCommand.php
index b160da3..e0f26a3 100644
--- a/src/Commands/JobDeleteCommand.php
+++ b/src/Commands/JobDeleteCommand.php
@@ -53,7 +53,7 @@ class JobDeleteCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         try {
             $domain = studly_case($this->argument('domain'));
diff --git a/src/Commands/JobMakeCommand.php b/src/Commands/JobMakeCommand.php
index 2b45972..fc5c336 100644
--- a/src/Commands/JobMakeCommand.php
+++ b/src/Commands/JobMakeCommand.php
@@ -55,7 +55,7 @@ class JobMakeCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         $generator = new JobGenerator();
 
diff --git a/src/Commands/ModelDeleteCommand.php b/src/Commands/ModelDeleteCommand.php
index c484b55..35e3b4a 100644
--- a/src/Commands/ModelDeleteCommand.php
+++ b/src/Commands/ModelDeleteCommand.php
@@ -49,7 +49,7 @@ class ModelDeleteCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         try {
             $model = $this->parseModelName($this->argument('model'));
@@ -98,4 +98,4 @@ public function parseModelName($name)
     {
         return Str::model($name);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Commands/ModelMakeCommand.php b/src/Commands/ModelMakeCommand.php
index 1667a34..f94a80f 100644
--- a/src/Commands/ModelMakeCommand.php
+++ b/src/Commands/ModelMakeCommand.php
@@ -49,7 +49,7 @@ class ModelMakeCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         $generator = new ModelGenerator();
 
@@ -89,4 +89,4 @@ public function getStub()
     {
         return __DIR__ . '/../Generators/stubs/model.stub';
     }
-}
\ No newline at end of file
+}
diff --git a/src/Commands/OperationDeleteCommand.php b/src/Commands/OperationDeleteCommand.php
index ac44680..4fd5866 100644
--- a/src/Commands/OperationDeleteCommand.php
+++ b/src/Commands/OperationDeleteCommand.php
@@ -53,7 +53,7 @@ class OperationDeleteCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         try {
             $service = Str::service($this->argument('service'));
diff --git a/src/Commands/OperationMakeCommand.php b/src/Commands/OperationMakeCommand.php
index 463a98f..aaaaa01 100644
--- a/src/Commands/OperationMakeCommand.php
+++ b/src/Commands/OperationMakeCommand.php
@@ -55,7 +55,7 @@ class OperationMakeCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         $generator = new OperationGenerator();
 
diff --git a/src/Commands/PolicyDeleteCommand.php b/src/Commands/PolicyDeleteCommand.php
index c10df9b..7737421 100644
--- a/src/Commands/PolicyDeleteCommand.php
+++ b/src/Commands/PolicyDeleteCommand.php
@@ -49,7 +49,7 @@ class PolicyDeleteCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         try {
             $policy = $this->parsePolicyName($this->argument('policy'));
@@ -98,4 +98,4 @@ public function parsePolicyName($name)
     {
         return Str::policy($name);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Commands/PolicyMakeCommand.php b/src/Commands/PolicyMakeCommand.php
index 7dd26b3..0d04bf1 100644
--- a/src/Commands/PolicyMakeCommand.php
+++ b/src/Commands/PolicyMakeCommand.php
@@ -49,7 +49,7 @@ class PolicyMakeCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         $generator = new PolicyGenerator();
 
@@ -89,4 +89,4 @@ public function getStub()
     {
         return __DIR__ . '/../Generators/stubs/policy.stub';
     }
-}
\ No newline at end of file
+}
diff --git a/src/Commands/RequestDeleteCommand.php b/src/Commands/RequestDeleteCommand.php
index e0ebc0c..2f1ef8b 100644
--- a/src/Commands/RequestDeleteCommand.php
+++ b/src/Commands/RequestDeleteCommand.php
@@ -49,7 +49,7 @@ class RequestDeleteCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         try {
             $request = $this->parseRequestName($this->argument('request'));
@@ -100,4 +100,4 @@ public function parseRequestName($name)
     {
         return Str::request($name);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Commands/RequestMakeCommand.php b/src/Commands/RequestMakeCommand.php
index f1a7316..980710d 100644
--- a/src/Commands/RequestMakeCommand.php
+++ b/src/Commands/RequestMakeCommand.php
@@ -49,7 +49,7 @@ class RequestMakeCommand extends SymfonyCommand
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         $generator = new RequestGenerator();
 
@@ -91,4 +91,4 @@ public function getStub()
     {
         return __DIR__ . '/../Generators/stubs/request.stub';
     }
-}
\ No newline at end of file
+}
diff --git a/src/Commands/ServiceDeleteCommand.php b/src/Commands/ServiceDeleteCommand.php
index 74929c6..304d5a2 100644
--- a/src/Commands/ServiceDeleteCommand.php
+++ b/src/Commands/ServiceDeleteCommand.php
@@ -70,7 +70,7 @@ protected function getStub()
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         if ($this->isMicroservice()) {
             return $this->error('This functionality is disabled in a Microservice');
diff --git a/src/Commands/ServiceMakeCommand.php b/src/Commands/ServiceMakeCommand.php
index 2373268..61297b3 100644
--- a/src/Commands/ServiceMakeCommand.php
+++ b/src/Commands/ServiceMakeCommand.php
@@ -70,7 +70,7 @@ protected function getStub()
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         try {
             $name = $this->argument('name');
diff --git a/src/Commands/ServicesListCommand.php b/src/Commands/ServicesListCommand.php
index a07a9a4..5cbde23 100644
--- a/src/Commands/ServicesListCommand.php
+++ b/src/Commands/ServicesListCommand.php
@@ -37,7 +37,7 @@ class ServicesListCommand extends SymfonyCommand
      */
     protected $description = 'List the services in this project.';
 
-    public function fire()
+    public function handle()
     {
         $services = $this->listServices()->all();
 
diff --git a/src/Generators/stubs/feature-test.stub b/src/Generators/stubs/feature-test.stub
index afa4ca5..6d1e990 100644
--- a/src/Generators/stubs/feature-test.stub
+++ b/src/Generators/stubs/feature-test.stub
@@ -1,7 +1,7 @@
 <?php
 namespace {{namespace}};
 
-use TestCase;
+use Tests\TestCase;
 use {{feature_namespace}};
 
 class {{testclass}} extends TestCase
diff --git a/src/Generators/stubs/job-test.stub b/src/Generators/stubs/job-test.stub
index 4b35ed2..1c71cfa 100644
--- a/src/Generators/stubs/job-test.stub
+++ b/src/Generators/stubs/job-test.stub
@@ -2,7 +2,7 @@
 namespace {{namespace}};
 
 use {{job_namespace}};
-use PHPUnit_Framework_TestCase as TestCase;
+use Tests\TestCase;
 
 class {{testclass}} extends TestCase
 {
diff --git a/src/Generators/stubs/operation-test.stub b/src/Generators/stubs/operation-test.stub
index 814fc52..df7090d 100644
--- a/src/Generators/stubs/operation-test.stub
+++ b/src/Generators/stubs/operation-test.stub
@@ -1,7 +1,7 @@
 <?php
 namespace {{namespace}};
 
-use TestCase;
+use Tests\TestCase;
 use {{operation_namespace}};
 
 class {{testclass}} extends TestCase