diff --git a/src/stubs/lang.stub b/src/stubs/lang.stub
index d869952..c296fc5 100644
--- a/src/stubs/lang.stub
+++ b/src/stubs/lang.stub
@@ -2,7 +2,7 @@
 
 return [
     // Labels
-    'item'           => 'Master',
+    'master'         => 'Master',
     'list'           => 'Master List',
     'search'         => 'Search Master',
     'not_found'      => 'Master not found.',
diff --git a/src/stubs/test-unit.stub b/src/stubs/test-unit.stub
index 073c62c..e9b0834 100644
--- a/src/stubs/test-unit.stub
+++ b/src/stubs/test-unit.stub
@@ -13,7 +13,7 @@ class MasterTest extends TestCase
     /** @test */
     public function it_has_name_attribute()
     {
-        $item = factory(Master::class)->create(['name' => 'Master 1 name']);
-        $this->assertEquals('Master 1 name', $item->name);
+        $master = factory(Master::class)->create(['name' => 'Master 1 name']);
+        $this->assertEquals('Master 1 name', $master->name);
     }
 }
diff --git a/src/stubs/view-forms.stub b/src/stubs/view-forms.stub
index cd06c5b..9fe2ea7 100644
--- a/src/stubs/view-forms.stub
+++ b/src/stubs/view-forms.stub
@@ -32,11 +32,11 @@
         <div class="panel-body">{{ trans('app.delete_confirm') }}</div>
         <div class="panel-footer">
             {!! FormField::delete(
-                ['route'=>['items.destroy',$editableItem->id]],
+                ['route'=>['masters.destroy',$editableMaster->id]],
                 trans('app.delete_confirm_button'),
                 ['class'=>'btn btn-danger'],
                 [
-                    'item_id' => $editableItem->id,
+                    'master_id' => $editableMaster->id,
                     'page' => request('page'),
                     'q' => request('q'),
                 ]
diff --git a/src/stubs/view-index.stub b/src/stubs/view-index.stub
index e82b095..3755bd7 100644
--- a/src/stubs/view-index.stub
+++ b/src/stubs/view-index.stub
@@ -32,21 +32,21 @@
                 <tbody>
                     @foreach($masters as $key => $master)
                     <tr>
-                        <td class="text-center">{{ $items->firstItem() + $key }}</td>
+                        <td class="text-center">{{ $masters->firstItem() + $key }}</td>
                         <td>{{ $master->name }}</td>
                         <td>{{ $master->description }}</td>
                         <td class="text-center">
                             {!! link_to_route(
-                                'items.index',
+                                'masters.index',
                                 trans('app.edit'),
-                                ['action' => 'edit', 'id' => $item->id] + Request::only('page', 'q'),
-                                ['id' => 'edit-item-' . $item->id]
+                                ['action' => 'edit', 'id' => $master->id] + Request::only('page', 'q'),
+                                ['id' => 'edit-master-' . $master->id]
                             ) !!} |
                             {!! link_to_route(
-                                'items.index',
+                                'masters.index',
                                 trans('app.delete'),
-                                ['action' => 'delete', 'id' => $item->id] + Request::only('page', 'q'),
-                                ['id' => 'del-item-' . $item->id]
+                                ['action' => 'delete', 'id' => $master->id] + Request::only('page', 'q'),
+                                ['id' => 'del-master-' . $master->id]
                             ) !!}
                         </td>
                     </tr>
diff --git a/tests/Generators/LangGeneratorTest.php b/tests/Generators/LangGeneratorTest.php
index 2451ad9..506fbab 100644
--- a/tests/Generators/LangGeneratorTest.php
+++ b/tests/Generators/LangGeneratorTest.php
@@ -17,7 +17,7 @@ class LangGeneratorTest extends TestCase
 
 return [
     // Labels
-    'item'           => 'Item',
+    'item'         => 'Item',
     'list'           => 'Item List',
     'search'         => 'Search Item',
     'not_found'      => 'Item not found.',