diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php
index 479b53d6d6..a7f25523e3 100755
--- a/app/Http/Controllers/AccessoriesController.php
+++ b/app/Http/Controllers/AccessoriesController.php
@@ -384,7 +384,7 @@ class AccessoriesController extends Controller
      * {
      *  "actions": "(links to available actions)",
      *  "category": "(link to category)",
-     *  "companyName": "My Company",
+     *  "company": "My Company",
      *  "location":  "My Location",
      *  "min_amt": 2,
      *  "name":  "(link to accessory),
@@ -419,7 +419,7 @@ class AccessoriesController extends Controller
         $offset = request('offset', 0);
         $limit = request('limit', 50);
 
-        $allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','companyName','category','model_number', 'manufacturer', 'location'];
+        $allowed_columns = ['name','min_amt','order_number','purchase_date','purchase_cost','company','category','model_number', 'manufacturer', 'location'];
         $order = Input::get('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array(Input::get('sort'), $allowed_columns) ? e(Input::get('sort')) : 'created_at';
 
@@ -427,7 +427,7 @@ class AccessoriesController extends Controller
             case 'category':
                 $accessories = $accessories->OrderCategory($order);
                 break;
-            case 'companyName':
+            case 'company':
                 $accessories = $accessories->OrderCompany($order);
                 break;
             case 'location':
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index 22e34c1e59..f642903455 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -38,7 +38,7 @@ class AccessoriesController extends Controller
             case 'category':
                 $accessories = $accessories->OrderCategory($order);
                 break;
-            case 'companyName':
+            case 'company':
                 $accessories = $accessories->OrderCompany($order);
                 break;
             default:
diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php
index 0e3cb3431c..1c1401dba0 100644
--- a/app/Http/Controllers/AssetMaintenancesController.php
+++ b/app/Http/Controllers/AssetMaintenancesController.php
@@ -134,7 +134,7 @@ class AssetMaintenancesController extends Controller
                 'completion_date'     => $maintenance->completion_date,
                 'user_id'       => ($maintenance->admin) ? (string)link_to_route('users.show', $maintenance->admin->present()->fullName(), ['user'=>$maintenance->admin->id]) : '',
                 'actions'       => $actions,
-                'companyName'   => ($maintenance->asset->company) ? $maintenance->asset->company->name : ''
+                'company'   => ($maintenance->asset->company) ? $maintenance->asset->company->name : ''
             );
         }
 
diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php
index a198bdbb44..def34e7e72 100644
--- a/app/Http/Transformers/LicensesTransformer.php
+++ b/app/Http/Transformers/LicensesTransformer.php
@@ -22,7 +22,7 @@ class LicensesTransformer
         $array = [
             'id' => $license->id,
             'name' => e($license->name),
-            'companyName' => e($license->companyName),
+            'company' => e($license->company->name),
             'manufacturer' => ($license->manufacturer) ? $license->manufacturer : null,
             'serial' => e($license->name),
             'purchase_order' => e($license->order_number),
diff --git a/resources/views/asset_maintenances/index.blade.php b/resources/views/asset_maintenances/index.blade.php
index 18840c7966..ac25fa4894 100644
--- a/resources/views/asset_maintenances/index.blade.php
+++ b/resources/views/asset_maintenances/index.blade.php
@@ -31,7 +31,7 @@
         >
           <thead>
             <tr>
-              <th data-field="companyName" data-sortable="false" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
+              <th data-field="company" data-sortable="false" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
               <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
               <th data-sortable="false" data-field="asset_name">{{ trans('admin/asset_maintenances/table.asset_name') }}</th>
               <th data-sortable="false" data-field="supplier">{{ trans('general.supplier') }}</th>
diff --git a/resources/views/categories/view.blade.php b/resources/views/categories/view.blade.php
index 935901284c..46ea31a828 100644
--- a/resources/views/categories/view.blade.php
+++ b/resources/views/categories/view.blade.php
@@ -37,7 +37,7 @@
         >
           <thead>
             <tr>
-              <th data-searchable="false" data-sortable="false" data-field="companyName" data-visible="false">
+              <th data-searchable="false" data-sortable="false" data-field="company" data-visible="false">
                   {{ trans('admin/companies/table.title') }}
               </th>
               <th data-searchable="false" data-sortable="false" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
diff --git a/resources/views/licenses/index.blade.php b/resources/views/licenses/index.blade.php
index 953ea02e84..f1e9f7ccc0 100755
--- a/resources/views/licenses/index.blade.php
+++ b/resources/views/licenses/index.blade.php
@@ -35,7 +35,7 @@
                 <tr>
                     <th data-checkbox="true" data-field="checkbox"></th>
                     <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                    <th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('general.company') }}</th>
+                    <th data-field="company" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('general.company') }}</th>
                     <th data-sortable="true" data-field="name" data-visible="false" data-formatter="licensesLinkFormatter">{{ trans('admin/licenses/table.title') }}</th>
                     <th data-field="manufacturer" data-sortable="true" data-formatter="manufacturersLinkObjFormatter">{{ trans('general.manufacturer') }}</th>
                     <th data-field="serial" data-sortable="true" >{{ trans('admin/licenses/form.license_key') }}</th>
diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php
index 65f579f5ca..9d782b3868 100644
--- a/resources/views/manufacturers/view.blade.php
+++ b/resources/views/manufacturers/view.blade.php
@@ -55,7 +55,7 @@
           >
             <thead>
               <tr>
-                <th data-searchable="false" data-sortable="false" data-field="companyName" data-visible="false">
+                <th data-searchable="false" data-sortable="false" data-field="company" data-visible="false">
                     {{ trans('admin/companies/table.title') }}
                 </th>
                 <th data-searchable="false" data-sortable="false" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
@@ -84,7 +84,7 @@
             <thead>
               <tr>
                 <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                <th data-field="companyName" data-sortable="false" data-switchable="true">{{ trans('general.company') }}</th>
+                <th data-field="company" data-sortable="false" data-switchable="true">{{ trans('general.company') }}</th>
                 <th data-field="name" data-sortable="true">{{ trans('admin/licenses/table.title') }}</th>
                 <th data-field="manufacturer" data-sortable="true">{{ trans('general.manufacturer') }}</th>
                 <th data-field="serial" data-sortable="true" >{{ trans('admin/licenses/table.serial') }}</th>
@@ -115,7 +115,7 @@
           >
             <thead>
               <tr>
-                <th data-switchable="true" data-searchable="true" data-sortable="true" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
+                <th data-switchable="true" data-searchable="true" data-sortable="true" data-field="company" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
                 <th data-sortable="true" data-searchable="true"  data-field="name">{{ trans('admin/accessories/table.title') }}</th>
                 <th data-searchable="true" data-sortable="true" data-field="category">{{ trans('admin/accessories/general.accessory_category') }}</th>
                 <th data-field="manufacturer" data-searchable="true" data-sortable="true">{{ trans('general.manufacturer') }}</th>
@@ -145,7 +145,7 @@
             <thead>
               <tr>
                 <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                <th data-switchable="true" data-searchable="true" data-sortable="true" data-field="companyName">{{ trans('admin/companies/table.title') }}</th>
+                <th data-switchable="true" data-searchable="true" data-sortable="true" data-field="company">{{ trans('admin/companies/table.title') }}</th>
                 <th data-sortable="true" data-searchable="true" data-field="name">{{ trans('admin/consumables/table.title') }}</th>
                 <th data-searchable="true" data-sortable="true" data-field="location">{{ trans('general.location') }}</th>
                 <th data-searchable="true" data-sortable="true" data-field="category">{{ trans('general.category') }}</th>
diff --git a/resources/views/reports/asset.blade.php b/resources/views/reports/asset.blade.php
index d6824e6804..d49b974d8a 100644
--- a/resources/views/reports/asset.blade.php
+++ b/resources/views/reports/asset.blade.php
@@ -35,7 +35,7 @@
                                 <th data-class="hidden-xs" data-switchable="false" data-searchable="false" data-sortable="false" data-field="checkbox"><div class="text-center"><input type="checkbox" id="checkAll" style="padding-left: 0px;"></div></th>
                                 @endif
                                 <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                                <th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
+                                <th data-field="company" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
                                 <th data-sortable="true" data-field="name" data-visible="false">{{ trans('admin/hardware/form.name') }}</th>
                                 <th data-sortable="true" data-field="asset_tag">{{ trans('admin/hardware/table.asset_tag') }}</th>
                                 <th data-sortable="true" data-field="serial">{{ trans('admin/hardware/table.serial') }}</th>
diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php
index 1a8dbf98aa..8bf7cf2819 100644
--- a/resources/views/statuslabels/view.blade.php
+++ b/resources/views/statuslabels/view.blade.php
@@ -50,7 +50,7 @@
                                         <th data-checkbox="true" data-field="checkbox"></th>
                                     @endif
                                     <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                                    <th data-field="companyName" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
+                                    <th data-field="company" data-searchable="true" data-sortable="true" data-switchable="true" data-visible="false">{{ trans('general.company') }}</th>
                                     <th data-sortable="true" data-field="image" data-visible="false">{{ trans('admin/hardware/table.image') }}</th>
                                     <th data-sortable="true" data-field="name" data-visible="false">{{ trans('admin/hardware/form.name') }}</th>
                                     <th data-sortable="true" data-field="asset_tag" data-formatter="assetLinkFormatter">{{ trans('admin/hardware/table.asset_tag') }}</th>
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 932e26dd4b..e4f8b82538 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -73,7 +73,7 @@
                         <th data-checkbox="true" data-field="checkbox"></th>
                      @endif
                    <th data-switchable="true" data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                   <th data-switchable="true" data-sortable="false" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
+                   <th data-switchable="true" data-sortable="false" data-field="company" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
                    <th data-switchable="true" data-sortable="true" data-field="employee_num" data-visible="false">{{ trans('admin/users/table.employee_num') }}</th>
                    <th data-sortable="true" data-field="name" data-formatter="usersLinkFormatter">{{ trans('admin/users/table.name') }}</th>
                    <th data-switchable="true" data-sortable="true" data-field="jobtitle" data-visible="false">{{ trans('admin/users/table.title') }}</th>