diff --git a/src/stubs/database/factories/model-factory.stub b/src/stubs/database/factories/model-factory.stub
index 03761ff..304dafd 100644
--- a/src/stubs/database/factories/model-factory.stub
+++ b/src/stubs/database/factories/model-factory.stub
@@ -1,16 +1,23 @@
 <?php
 
-use App\User;
+namespace Database\Factories;
+
+use App\Models\User;
 use fullMstr;
-use Faker\Generator as Faker;
+use Illuminate\Database\Eloquent\Factories\Factory;
 
-$factory->define(Master::class, function (Faker $faker) {
+class MasterFactory extends Factory
+{
+    protected $model = Master::class;
 
-    return [
-        'name' => $faker->word,
-        'description' => $faker->sentence,
-        'creator_id' => function () {
-            return factory(User::class)->create()->id;
-        },
-    ];
-});
+    public function definition()
+    {
+        return [
+            'name'        => $this->faker->word,
+            'description' => $this->faker->sentence,
+            'creator_id'  => function () {
+                return User::factory()->create()->id;
+            },
+        ];
+    }
+}
\ No newline at end of file
diff --git a/src/stubs/models/model-formfield.stub b/src/stubs/models/model-formfield.stub
index e722cc5..f755497 100644
--- a/src/stubs/models/model-formfield.stub
+++ b/src/stubs/models/model-formfield.stub
@@ -3,10 +3,13 @@
 namespace mstrNmspc;
 
 use App\User;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Master extends Model
 {
+    use HasFactory;
+
     protected $fillable = ['name', 'description', 'creator_id'];
 
     public function getNameLinkAttribute()
diff --git a/src/stubs/models/model.stub b/src/stubs/models/model.stub
index ab427dc..0c70568 100644
--- a/src/stubs/models/model.stub
+++ b/src/stubs/models/model.stub
@@ -3,10 +3,13 @@
 namespace mstrNmspc;
 
 use App\User;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Master extends Model
 {
+    use HasFactory;
+
     protected $fillable = ['name', 'description', 'creator_id'];
 
     public function getNameLinkAttribute()
diff --git a/src/stubs/routes/web.stub b/src/stubs/routes/web.stub
index fd9c2aa..36f6876 100644
--- a/src/stubs/routes/web.stub
+++ b/src/stubs/routes/web.stub
@@ -2,4 +2,4 @@
 /*
  * Masters Routes
  */
-Route::resource('masters', 'MasterController');
+Route::resource('masters', App\Http\Controllers\MasterController::class);
diff --git a/src/stubs/testcases/browserkit-base-class.stub b/src/stubs/testcases/browserkit-base-class.stub
index e5bdc1f..f1ee9e8 100644
--- a/src/stubs/testcases/browserkit-base-class.stub
+++ b/src/stubs/testcases/browserkit-base-class.stub
@@ -2,7 +2,7 @@
 
 namespace Tests;
 
-use App\User;
+use App\Models\User;
 use Laravel\BrowserKitTesting\TestCase as BaseTestCase;
 
 abstract class BrowserKitTest extends BaseTestCase
@@ -21,6 +21,6 @@ abstract class BrowserKitTest extends BaseTestCase
 
     protected function createUser()
     {
-        return factory(User::class)->create();
+        return User::factory()->create();
     }
 }
diff --git a/src/stubs/testcases/feature/api.stub b/src/stubs/testcases/feature/api.stub
index ea35101..d7e12a7 100644
--- a/src/stubs/testcases/feature/api.stub
+++ b/src/stubs/testcases/feature/api.stub
@@ -14,7 +14,7 @@ class ManageMasterTest extends TestCase
     public function user_can_see_master_list_in_master_index_page()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
 
         $this->getJson(route('api.masters.index'), [
             'Authorization' => 'Bearer '.$user->api_token
@@ -111,7 +111,7 @@ class ManageMasterTest extends TestCase
     public function user_can_get_a_master_detail()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create(['name' => 'Testing 123']);
+        $singleMstr = Master::factory()->create(['name' => 'Testing 123']);
 
         $this->getJson(route('api.masters.show', $singleMstr), [
             'Authorization' => 'Bearer '.$user->api_token
@@ -124,7 +124,7 @@ class ManageMasterTest extends TestCase
     public function user_can_update_a_master()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create(['name' => 'Testing 123']);
+        $singleMstr = Master::factory()->create(['name' => 'Testing 123']);
 
         $this->patchJson(route('api.masters.update', $singleMstr), [
             'name'        => 'Master 1 name',
@@ -158,7 +158,7 @@ class ManageMasterTest extends TestCase
     public function validate_master_name_update_is_required()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
 
         // name empty
         $requestBody = $this->getEditFields(['name' => '']);
@@ -176,7 +176,7 @@ class ManageMasterTest extends TestCase
     public function validate_master_name_update_is_not_more_than_60_characters()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
 
         // name 70 characters
         $requestBody = $this->getEditFields(['name' => str_repeat('Test Title', 7)]);
@@ -194,7 +194,7 @@ class ManageMasterTest extends TestCase
     public function validate_master_description_update_is_not_more_than_255_characters()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create(['name' => 'Testing 123']);
+        $singleMstr = Master::factory()->create(['name' => 'Testing 123']);
 
         // description 256 characters
         $requestBody = $this->getEditFields(['description' => str_repeat('Long description', 16)]);
@@ -212,7 +212,7 @@ class ManageMasterTest extends TestCase
     public function user_can_delete_a_master()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
 
         $this->deleteJson(route('api.masters.destroy', $singleMstr), [
             'master_id' => $singleMstr->id,
diff --git a/src/stubs/testcases/feature/full.stub b/src/stubs/testcases/feature/full.stub
index bcea142..22d4626 100644
--- a/src/stubs/testcases/feature/full.stub
+++ b/src/stubs/testcases/feature/full.stub
@@ -13,7 +13,7 @@ class ManageMasterTest extends TestCase
     /** @test */
     public function user_can_see_master_list_in_master_index_page()
     {
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
 
         $this->loginAsUser();
         $this->visitRoute('masters.index');
@@ -90,7 +90,7 @@ class ManageMasterTest extends TestCase
     public function user_can_edit_a_master()
     {
         $this->loginAsUser();
-        $singleMstr = factory(Master::class)->create(['name' => 'Testing 123']);
+        $singleMstr = Master::factory()->create(['name' => 'Testing 123']);
 
         $this->visitRoute('masters.show', $singleMstr);
         $this->click('edit-master-'.$singleMstr->id);
@@ -109,7 +109,7 @@ class ManageMasterTest extends TestCase
     public function validate_master_name_update_is_required()
     {
         $this->loginAsUser();
-        $master = factory(Master::class)->create(['name' => 'Testing 123']);
+        $master = Master::factory()->create(['name' => 'Testing 123']);
 
         // name empty
         $this->patch(route('masters.update', $master), $this->getEditFields(['name' => '']));
@@ -120,7 +120,7 @@ class ManageMasterTest extends TestCase
     public function validate_master_name_update_is_not_more_than_60_characters()
     {
         $this->loginAsUser();
-        $master = factory(Master::class)->create(['name' => 'Testing 123']);
+        $master = Master::factory()->create(['name' => 'Testing 123']);
 
         // name 70 characters
         $this->patch(route('masters.update', $master), $this->getEditFields([
@@ -133,7 +133,7 @@ class ManageMasterTest extends TestCase
     public function validate_master_description_update_is_not_more_than_255_characters()
     {
         $this->loginAsUser();
-        $master = factory(Master::class)->create(['name' => 'Testing 123']);
+        $master = Master::factory()->create(['name' => 'Testing 123']);
 
         // description 256 characters
         $this->patch(route('masters.update', $master), $this->getEditFields([
@@ -146,8 +146,8 @@ class ManageMasterTest extends TestCase
     public function user_can_delete_a_master()
     {
         $this->loginAsUser();
-        $singleMstr = factory(Master::class)->create();
-        factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
+        Master::factory()->create();
 
         $this->visitRoute('masters.edit', $singleMstr);
         $this->click('del-master-'.$singleMstr->id);
diff --git a/src/stubs/testcases/feature/simple.stub b/src/stubs/testcases/feature/simple.stub
index b4c0884..702a8bd 100644
--- a/src/stubs/testcases/feature/simple.stub
+++ b/src/stubs/testcases/feature/simple.stub
@@ -13,7 +13,7 @@ class ManageMasterTest extends TestCase
     /** @test */
     public function user_can_see_master_list_in_master_index_page()
     {
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
 
         $this->loginAsUser();
         $this->visitRoute('masters.index');
@@ -88,7 +88,7 @@ class ManageMasterTest extends TestCase
     public function user_can_edit_a_master_within_search_query()
     {
         $this->loginAsUser();
-        $singleMstr = factory(Master::class)->create(['name' => 'Testing 123']);
+        $singleMstr = Master::factory()->create(['name' => 'Testing 123']);
 
         $this->visitRoute('masters.index', ['q' => '123']);
         $this->click('edit-master-'.$singleMstr->id);
@@ -119,7 +119,7 @@ class ManageMasterTest extends TestCase
     public function validate_master_name_update_is_required()
     {
         $this->loginAsUser();
-        $master = factory(Master::class)->create(['name' => 'Testing 123']);
+        $master = Master::factory()->create(['name' => 'Testing 123']);
 
         // name empty
         $this->patch(route('masters.update', $master), $this->getEditFields(['name' => '']));
@@ -130,7 +130,7 @@ class ManageMasterTest extends TestCase
     public function validate_master_name_update_is_not_more_than_60_characters()
     {
         $this->loginAsUser();
-        $master = factory(Master::class)->create(['name' => 'Testing 123']);
+        $master = Master::factory()->create(['name' => 'Testing 123']);
 
         // name 70 characters
         $this->patch(route('masters.update', $master), $this->getEditFields([
@@ -143,7 +143,7 @@ class ManageMasterTest extends TestCase
     public function validate_master_description_update_is_not_more_than_255_characters()
     {
         $this->loginAsUser();
-        $master = factory(Master::class)->create(['name' => 'Testing 123']);
+        $master = Master::factory()->create(['name' => 'Testing 123']);
 
         // description 256 characters
         $this->patch(route('masters.update', $master), $this->getEditFields([
@@ -156,8 +156,8 @@ class ManageMasterTest extends TestCase
     public function user_can_delete_a_master()
     {
         $this->loginAsUser();
-        $singleMstr = factory(Master::class)->create();
-        factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
+        Master::factory()->create();
 
         $this->visitRoute('masters.index', ['action' => 'edit', 'id' => $singleMstr->id]);
         $this->click('del-master-'.$singleMstr->id);
diff --git a/src/stubs/testcases/unit/model-formfield.stub b/src/stubs/testcases/unit/model-formfield.stub
index a376315..059390c 100644
--- a/src/stubs/testcases/unit/model-formfield.stub
+++ b/src/stubs/testcases/unit/model-formfield.stub
@@ -14,7 +14,7 @@ class MasterTest extends TestCase
     /** @test */
     public function a_master_has_name_link_attribute()
     {
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
 
         $this->assertEquals(
             link_to_route('masters.show', $singleMstr->name, [$singleMstr], [
@@ -29,7 +29,7 @@ class MasterTest extends TestCase
     /** @test */
     public function a_master_has_belongs_to_creator_relation()
     {
-        $singleMstr = factory(Master::class)->make();
+        $singleMstr = Master::factory()->make();
 
         $this->assertInstanceOf(User::class, $singleMstr->creator);
         $this->assertEquals($singleMstr->creator_id, $singleMstr->creator->id);
diff --git a/src/stubs/testcases/unit/model-policy.stub b/src/stubs/testcases/unit/model-policy.stub
index 0ff2118..67e6ccd 100644
--- a/src/stubs/testcases/unit/model-policy.stub
+++ b/src/stubs/testcases/unit/model-policy.stub
@@ -21,7 +21,7 @@ class MasterPolicyTest extends TestCase
     public function user_can_view_master()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
         $this->assertTrue($user->can('view', $singleMstr));
     }
 
@@ -29,7 +29,7 @@ class MasterPolicyTest extends TestCase
     public function user_can_update_master()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
         $this->assertTrue($user->can('update', $singleMstr));
     }
 
@@ -37,7 +37,7 @@ class MasterPolicyTest extends TestCase
     public function user_can_delete_master()
     {
         $user = $this->createUser();
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
         $this->assertTrue($user->can('delete', $singleMstr));
     }
 }
diff --git a/src/stubs/testcases/unit/model.stub b/src/stubs/testcases/unit/model.stub
index 21fa2c0..ae388c2 100644
--- a/src/stubs/testcases/unit/model.stub
+++ b/src/stubs/testcases/unit/model.stub
@@ -14,7 +14,7 @@ class MasterTest extends TestCase
     /** @test */
     public function a_master_has_name_link_attribute()
     {
-        $singleMstr = factory(Master::class)->create();
+        $singleMstr = Master::factory()->create();
 
         $title = __('app.show_detail_title', [
             'name' => $singleMstr->name, 'type' => __('master.master'),
@@ -30,7 +30,7 @@ class MasterTest extends TestCase
     /** @test */
     public function a_master_has_belongs_to_creator_relation()
     {
-        $singleMstr = factory(Master::class)->make();
+        $singleMstr = Master::factory()->make();
 
         $this->assertInstanceOf(User::class, $singleMstr->creator);
         $this->assertEquals($singleMstr->creator_id, $singleMstr->creator->id);