diff --git a/modules/backend/console/scaffold/controller/controller.stub b/modules/backend/console/scaffold/controller/controller.stub
index 1d0b5c8cda..4d1522c387 100644
--- a/modules/backend/console/scaffold/controller/controller.stub
+++ b/modules/backend/console/scaffold/controller/controller.stub
@@ -1,7 +1,9 @@
-<?php namespace {{ plugin_namespace }}\Controllers;
+<?php
+
+namespace {{ plugin_namespace }}\Controllers;
 
-use BackendMenu;
 use Backend\Classes\Controller;
+use Backend\Facades\BackendMenu;
 
 /**
  * {{ title_name }} Backend Controller
diff --git a/modules/backend/console/scaffold/formwidget/formwidget.stub b/modules/backend/console/scaffold/formwidget/formwidget.stub
index 9fcf5045b0..091fb61976 100644
--- a/modules/backend/console/scaffold/formwidget/formwidget.stub
+++ b/modules/backend/console/scaffold/formwidget/formwidget.stub
@@ -1,4 +1,6 @@
-<?php namespace {{studly_author}}\{{studly_plugin}}\FormWidgets;
+<?php
+
+namespace {{studly_author}}\{{studly_plugin}}\FormWidgets;
 
 use Backend\Classes\FormWidgetBase;
 
diff --git a/modules/backend/console/scaffold/reportwidget/reportwidget.stub b/modules/backend/console/scaffold/reportwidget/reportwidget.stub
index bfe197259e..f58a265e9c 100644
--- a/modules/backend/console/scaffold/reportwidget/reportwidget.stub
+++ b/modules/backend/console/scaffold/reportwidget/reportwidget.stub
@@ -1,4 +1,6 @@
-<?php namespace {{studly_author}}\{{studly_plugin}}\ReportWidgets;
+<?php
+
+namespace {{studly_author}}\{{studly_plugin}}\ReportWidgets;
 
 use Backend\Classes\ReportWidgetBase;
 use Exception;
@@ -29,7 +31,7 @@ class {{studly_name}} extends ReportWidgetBase
             ],
         ];
     }
-    
+
     /**
      * Adds widget specific asset files. Use $this->addJs() and $this->addCss()
      * to register new assets to include on the page.
@@ -38,7 +40,7 @@ class {{studly_name}} extends ReportWidgetBase
     protected function loadAssets()
     {
     }
-    
+
     /**
      * Renders the widget's primary contents.
      * @return string HTML markup supplied by this widget.
diff --git a/modules/system/console/scaffold/job/job.batched.stub b/modules/system/console/scaffold/job/job.batched.stub
index 64267f2737..165aac47d0 100644
--- a/modules/system/console/scaffold/job/job.batched.stub
+++ b/modules/system/console/scaffold/job/job.batched.stub
@@ -12,7 +12,11 @@ use Illuminate\Queue\SerializesModels;
 
 class {{studly_name}} implements ShouldQueue
 {
-    use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Batchable;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * Create a new job instance.
diff --git a/modules/system/console/scaffold/job/job.queued.stub b/modules/system/console/scaffold/job/job.queued.stub
index 941db7fa73..e54510a81b 100644
--- a/modules/system/console/scaffold/job/job.queued.stub
+++ b/modules/system/console/scaffold/job/job.queued.stub
@@ -10,7 +10,10 @@ use Illuminate\Queue\SerializesModels;
 
 class {{studly_name}} implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * Create a new job instance.
diff --git a/modules/system/console/scaffold/plugin/plugin.stub b/modules/system/console/scaffold/plugin/plugin.stub
index b15df75f42..6819a474d3 100644
--- a/modules/system/console/scaffold/plugin/plugin.stub
+++ b/modules/system/console/scaffold/plugin/plugin.stub
@@ -2,7 +2,7 @@
 
 namespace {{ plugin_namespace }};
 
-use Backend;
+use Backend\Facades\Backend;
 use Backend\Models\UserRole;
 use System\Classes\PluginBase;
 
@@ -20,7 +20,7 @@ class Plugin extends PluginBase
             'name'        => '{{ plugin_id }}::lang.plugin.name',
             'description' => '{{ plugin_id }}::lang.plugin.description',
             'author'      => '{{ author }}',
-            'icon'        => 'icon-leaf'
+            'icon'        => 'icon-leaf',
         ];
     }
 
@@ -29,7 +29,6 @@ class Plugin extends PluginBase
      */
     public function register(): void
     {
-
     }
 
     /**
@@ -37,7 +36,6 @@ class Plugin extends PluginBase
      */
     public function boot(): void
     {
-
     }
 
     /**
diff --git a/modules/system/console/scaffold/settings/model.stub b/modules/system/console/scaffold/settings/model.stub
index 587f1c2e46..35f19dd14a 100644
--- a/modules/system/console/scaffold/settings/model.stub
+++ b/modules/system/console/scaffold/settings/model.stub
@@ -2,7 +2,7 @@
 
 namespace {{ plugin_namespace }}\Models;
 
-use Model;
+use Winter\Storm\Database\Model;
 
 /**
  * {{name}} Model
diff --git a/modules/system/console/scaffold/test/test.plugin.stub b/modules/system/console/scaffold/test/test.plugin.stub
index 50f2ff537c..1a9083ef8a 100644
--- a/modules/system/console/scaffold/test/test.plugin.stub
+++ b/modules/system/console/scaffold/test/test.plugin.stub
@@ -2,9 +2,9 @@
 
 namespace {{ plugin_namespace }}\Tests\Unit;
 
-use {{ plugin_namespace }}\Plugin;
 use System\Classes\PluginBase;
 use System\Tests\Bootstrap\PluginTestCase;
+use {{ plugin_namespace }}\Plugin;
 
 class PluginTest extends PluginTestCase
 {