diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 66abc53e2459..867bd9e77a9f 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -10,7 +10,7 @@ class BaseController extends Controller
 {
     use DispatchesJobs, AuthorizesRequests;
     
-    protected $entity;
+    protected $entityType;
 
     /**
      * Setup the layout used by the controller.
@@ -25,17 +25,17 @@ class BaseController extends Controller
     }
     
     protected function authorizeCreate() {
-        $this->authorize('create', $this->entity);
+        $this->authorize('create', $this->entityType);
     }
     
     protected function authorizeUpdate($input){
         $creating = empty($input['public_id']) || $input['public_id'] == '-1';
         
         if($creating){
-            $this->authorize('create', $this->entity);
+            $this->authorize('create', $this->entityType);
         }
         else{
-            $className = Utils::getEntityName($this->entity);
+            $className = Utils::getEntityName($this->entityType);
             
             $object = call_user_func(array("App\\Models\\{$className}", 'scope'), $input['public_id'])->firstOrFail();
             $this->authorize('edit', $object);
diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 49988ab78b79..3ef8966d30b7 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -35,7 +35,7 @@ class ClientController extends BaseController
 {
     protected $clientService;
     protected $clientRepo;
-    protected $entity = ENTITY_CLIENT;
+    protected $entityType = ENTITY_CLIENT;
 
     public function __construct(ClientRepository $clientRepo, ClientService $clientService)
     {
diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index 23577f951389..1e3586af1922 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -17,7 +17,7 @@ class CreditController extends BaseController
 {
     protected $creditRepo;
     protected $creditService;
-    protected $entity = ENTITY_CREDIT;
+    protected $entityType = ENTITY_CREDIT;
 
     public function __construct(CreditRepository $creditRepo, CreditService $creditService)
     {
diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
index c0e25e773d11..0720e1a5babf 100644
--- a/app/Http/Controllers/DocumentController.php
+++ b/app/Http/Controllers/DocumentController.php
@@ -15,7 +15,7 @@ use App\Ninja\Repositories\DocumentRepository;
 class DocumentController extends BaseController
 {
     protected $documentRepo;
-    protected $entity = ENTITY_DOCUMENT;
+    protected $entityType = ENTITY_DOCUMENT;
 
     public function __construct(DocumentRepository $documentRepo)
     {
diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index e65a485fa2f0..88a493d3ea21 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -25,7 +25,7 @@ class ExpenseController extends BaseController
     // Expenses
     protected $expenseRepo;
     protected $expenseService;
-    protected $entity = ENTITY_EXPENSE;
+    protected $entityType = ENTITY_EXPENSE;
 
     public function __construct(ExpenseRepository $expenseRepo, ExpenseService $expenseService)
     {
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 7aa9ca2d4d14..c3627a01c301 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -37,7 +37,7 @@ class InvoiceController extends BaseController
     protected $documentRepo;
     protected $invoiceService;
     protected $recurringInvoiceService;
-    protected $entity = ENTITY_INVOICE;
+    protected $entityType = ENTITY_INVOICE;
 
     public function __construct(Mailer $mailer, InvoiceRepository $invoiceRepo, ClientRepository $clientRepo, InvoiceService $invoiceService, DocumentRepository $documentRepo, RecurringInvoiceService $recurringInvoiceService)
     {
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 0a0fe1485676..bd5fb85199cf 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -30,7 +30,7 @@ use App\Http\Requests\UpdatePaymentRequest;
 
 class PaymentController extends BaseController
 {
-    protected $entity = ENTITY_PAYMENT;
+    protected $entityType = ENTITY_PAYMENT;
     
     public function __construct(PaymentRepository $paymentRepo, InvoiceRepository $invoiceRepo, AccountRepository $accountRepo, ContactMailer $contactMailer, PaymentService $paymentService)
     {
diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php
index e2228ab2a0c0..3a0062296098 100644
--- a/app/Http/Controllers/QuoteController.php
+++ b/app/Http/Controllers/QuoteController.php
@@ -33,7 +33,7 @@ class QuoteController extends BaseController
     protected $invoiceRepo;
     protected $clientRepo;
     protected $invoiceService;
-    protected $entity = ENTITY_INVOICE;
+    protected $entityType = ENTITY_INVOICE;
 
     public function __construct(Mailer $mailer, InvoiceRepository $invoiceRepo, ClientRepository $clientRepo, InvoiceService $invoiceService)
     {
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 7ff19436ead2..a1118269ac51 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -22,7 +22,7 @@ class TaskController extends BaseController
 {
     protected $taskRepo;
     protected $taskService;
-    protected $entity = ENTITY_TASK;
+    protected $entityType = ENTITY_TASK;
 
     public function __construct(TaskRepository $taskRepo, InvoiceRepository $invoiceRepo, TaskService $taskService)
     {
diff --git a/app/Http/Controllers/VendorController.php b/app/Http/Controllers/VendorController.php
index d53d6041fb18..9340b926d4eb 100644
--- a/app/Http/Controllers/VendorController.php
+++ b/app/Http/Controllers/VendorController.php
@@ -25,12 +25,12 @@ use App\Services\VendorService;
 
 use App\Http\Requests\CreateVendorRequest;
 use App\Http\Requests\UpdateVendorRequest;
-// vendor
+
 class VendorController extends BaseController
 {
     protected $vendorService;
     protected $vendorRepo;
-    protected $entity = ENTITY_VENDOR;
+    protected $entityType = ENTITY_VENDOR;
 
     public function __construct(VendorRepository $vendorRepo, VendorService $vendorService)
     {