diff --git a/config/modules.php b/config/modules.php
index b44531a4..6f4bd3ce 100644
--- a/config/modules.php
+++ b/config/modules.php
@@ -15,7 +15,7 @@ return [
             'views/frontend'         => 'Resources/views/layouts/frontend.blade.php',
             'views/admin'            => 'Resources/views/layouts/admin.blade.php',
             'listener-test'          => 'Listeners/TestEventListener.php',
-            'controller-api'         => 'Http/Controllers/Api/SampleController.php',
+            'controller-api'         => 'Http/Controllers/Api/ApiController.php',
             'controller-admin'       => 'Http/Controllers/Admin/AdminController.php',
             'scaffold/config'        => 'Config/config.php',
             'composer'               => 'composer.json',
diff --git a/resources/stubs/modules/controller-api.stub b/resources/stubs/modules/controller-api.stub
index 75396eb7..45a1e893 100644
--- a/resources/stubs/modules/controller-api.stub
+++ b/resources/stubs/modules/controller-api.stub
@@ -6,14 +6,15 @@ use App\Interfaces\Controller;
 use Illuminate\Http\Request;
 
 /**
- * class SampleController
+ * class ApiController
  * @package $MODULE_NAMESPACE$\$STUDLY_NAME$\Http\Controllers\Api
  */
-class SampleController extends RestController
+class ApiController extends Controller
 {
     /**
      * Just send out a message
      * @param Request $request
+     * @return mixed
      */
     public function index(Request $request)
     {
@@ -21,7 +22,9 @@ class SampleController extends RestController
     }
 
     /**
+     * Handles /hello
      * @param Request $request
+     * @return mixed
      */
     public function hello(Request $request)
     {
diff --git a/resources/stubs/modules/routes-api.stub b/resources/stubs/modules/routes-api.stub
index 7be2deac..d3eb3937 100644
--- a/resources/stubs/modules/routes-api.stub
+++ b/resources/stubs/modules/routes-api.stub
@@ -4,7 +4,7 @@
  * This is publicly accessible
  */
 Route::group(['middleware' => []], function() {
-    Route::get('/', '$STUDLY_NAME$Controller@index');
+    Route::get('/', 'ApiController@index');
 });
 
 /**
@@ -13,5 +13,5 @@ Route::group(['middleware' => []], function() {
 Route::group(['middleware' => [
     'api.auth'
 ]], function() {
-    Route::get('/hello', '$STUDLY_NAME$Controller@hello');
+    Route::get('/hello', 'ApiController@hello');
 });