diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.php
index 2a943fed99..ca507d1b51 100644
--- a/app/Http/Controllers/Api/UploadedFilesController.php
+++ b/app/Http/Controllers/Api/UploadedFilesController.php
@@ -10,7 +10,7 @@ use App\Http\Transformers\UploadedFilesTransformer;
 use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
-use App\Models\AssetMaintenance;
+use App\Models\Maintenance;
 use App\Models\AssetModel;
 use App\Models\Component;
 use App\Models\Consumable;
@@ -30,7 +30,7 @@ class UploadedFilesController extends Controller
 
     static $map_object_type = [
         'accessories' => Accessory::class,
-        'maintenances' => AssetMaintenance::class,
+        'maintenances' => Maintenance::class,
         'assets' => Asset::class,
         'components' => Component::class,
         'consumables' => Consumable::class,
@@ -43,7 +43,7 @@ class UploadedFilesController extends Controller
 
     static $map_storage_path = [
         'accessories' => 'private_uploads/accessories/',
-        'maintenances' => 'private_uploads/asset_maintenances/',
+        'maintenances' => 'private_uploads/maintenances/',
         'assets' => 'private_uploads/assets/',
         'components' => 'private_uploads/components/',
         'consumables' => 'private_uploads/consumables/',
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 6b5af9280b..954b7cb64c 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -9,7 +9,7 @@ use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
-use App\Models\AssetMaintenance;
+use App\Models\Maintenance;
 use App\Models\CheckoutAcceptance;
 use App\Models\Company;
 use App\Models\CustomField;
@@ -1036,11 +1036,11 @@ class ReportsController extends Controller
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    public function getAssetMaintenancesReport() : View
+    public function getMaintenancesReport() : View
     {
         $this->authorize('reports.view');
 
-        return view('reports.asset_maintenances');
+        return view('reports.maintenances');
     }
 
     /**
@@ -1049,11 +1049,11 @@ class ReportsController extends Controller
      * @author  Vincent Sposato <vincent.sposato@gmail.com>
      * @version v1.0
      */
-    public function exportAssetMaintenancesReport() : Response
+    public function exportMaintenancesReport() : Response
     {
         $this->authorize('reports.view');
         // Grab all the improvements
-        $assetMaintenances = AssetMaintenance::with('asset', 'supplier')
+        $Maintenances = Maintenance::with('asset', 'supplier')
                                              ->orderBy('created_at', 'DESC')
                                              ->get();
 
@@ -1061,36 +1061,36 @@ class ReportsController extends Controller
 
         $header = [
             trans('admin/hardware/table.asset_tag'),
-            trans('admin/asset_maintenances/table.asset_name'),
+            trans('admin/maintenances/table.asset_name'),
             trans('general.supplier'),
-            trans('admin/asset_maintenances/form.asset_maintenance_type'),
-            trans('admin/asset_maintenances/form.title'),
-            trans('admin/asset_maintenances/form.start_date'),
-            trans('admin/asset_maintenances/form.completion_date'),
-            trans('admin/asset_maintenances/form.asset_maintenance_time'),
-            trans('admin/asset_maintenances/form.cost'),
+            trans('admin/maintenances/form.asset_maintenance_type'),
+            trans('admin/maintenances/form.title'),
+            trans('admin/maintenances/form.start_date'),
+            trans('admin/maintenances/form.completion_date'),
+            trans('admin/maintenances/form.asset_maintenance_time'),
+            trans('admin/maintenances/form.cost'),
         ];
 
         $header = array_map('trim', $header);
         $rows[] = implode(',', $header);
 
-        foreach ($assetMaintenances as $assetMaintenance) {
+        foreach ($Maintenances as $maintenance) {
             $row = [];
-            $row[] = str_replace(',', '', e($assetMaintenance->asset->asset_tag));
-            $row[] = str_replace(',', '', e($assetMaintenance->asset->name));
-            $row[] = str_replace(',', '', e($assetMaintenance->supplier->name));
-            $row[] = e($assetMaintenance->improvement_type);
-            $row[] = e($assetMaintenance->title);
-            $row[] = e($assetMaintenance->start_date);
-            $row[] = e($assetMaintenance->completion_date);
-            if (is_null($assetMaintenance->asset_maintenance_time)) {
+            $row[] = str_replace(',', '', e($maintenance->asset->asset_tag));
+            $row[] = str_replace(',', '', e($maintenance->asset->name));
+            $row[] = str_replace(',', '', e($maintenance->supplier->name));
+            $row[] = e($maintenance->improvement_type);
+            $row[] = e($maintenance->name);
+            $row[] = e($maintenance->start_date);
+            $row[] = e($maintenance->completion_date);
+            if (is_null($maintenance->asset_maintenance_time)) {
                 $improvementTime = (int) Carbon::now()
-                    ->diffInDays(Carbon::parse($assetMaintenance->start_date), true);
+                    ->diffInDays(Carbon::parse($maintenance->start_date), true);
             } else {
-                $improvementTime = (int) $assetMaintenance->asset_maintenance_time;
+                $improvementTime = (int) $maintenance->asset_maintenance_time;
             }
             $row[]  = $improvementTime;
-            $row[]  = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost);
+            $row[]  = trans('general.currency') . Helper::formatCurrencyOutput($maintenance->cost);
             $rows[] = implode(',', $row);
         }
 
diff --git a/app/Http/Controllers/UploadedFilesController.php b/app/Http/Controllers/UploadedFilesController.php
index 3b0c717bad..bce40f7787 100644
--- a/app/Http/Controllers/UploadedFilesController.php
+++ b/app/Http/Controllers/UploadedFilesController.php
@@ -7,7 +7,7 @@ use App\Http\Requests\UploadFileRequest;
 use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
-use App\Models\AssetMaintenance;
+use App\Models\Maintenance;
 use App\Models\AssetModel;
 use App\Models\Component;
 use App\Models\Consumable;
@@ -33,7 +33,7 @@ class UploadedFilesController extends Controller
 
     static $map_object_type = [
         'accessories' => Accessory::class,
-        'maintenances' => AssetMaintenance::class,
+        'maintenances' => Maintenance::class,
         'assets' => Asset::class,
         'components' => Component::class,
         'consumables' => Consumable::class,
@@ -46,7 +46,7 @@ class UploadedFilesController extends Controller
 
     static $map_storage_path = [
         'accessories' => 'private_uploads/accessories/',
-        'maintenances' => 'private_uploads/asset_maintenances/',
+        'maintenances' => 'private_uploads/maintenances/',
         'assets' => 'private_uploads/assets/',
         'components' => 'private_uploads/components/',
         'consumables' => 'private_uploads/consumables/',
diff --git a/app/Models/Actionlog.php b/app/Models/Actionlog.php
index eb6ed73f49..ed485c910b 100755
--- a/app/Models/Actionlog.php
+++ b/app/Models/Actionlog.php
@@ -459,6 +459,7 @@ class Actionlog extends SnipeModel
     {
 
 
+
         if (($this->action_type == 'accepted') || ($this->action_type == 'declined')) {
             return route('log.storedeula.download', ['filename' => $this->filename]);
         }
@@ -469,9 +470,6 @@ class Actionlog extends SnipeModel
             $object = 'models';
         }
 
-        if ($object == 'asset_maintenances') {
-            $object = 'maintenances';
-        }
         return route('ui.files.show', [
             'object_type' => $object,
             'id' => $this->item_id,
@@ -490,8 +488,6 @@ class Actionlog extends SnipeModel
         switch ($this->item_type) {
         case Accessory::class:
             return 'private_uploads/accessories/'.$this->filename;
-       case AssetMaintenance::class:
-            return 'private_uploads/asset_maintenances/'.$this->filename;
         case Asset::class:
             return 'private_uploads/assets/'.$this->filename;
         case AssetModel::class:
@@ -504,6 +500,8 @@ class Actionlog extends SnipeModel
             return 'private_uploads/licenses/'.$this->filename;
         case Location::class:
             return 'private_uploads/locations/'.$this->filename;
+        case Maintenance::class:
+             return 'private_uploads/maintenances/'.$this->filename;
         case User::class:
             return 'private_uploads/users/'.$this->filename;
         default:
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index e983e6969a..244101723f 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -771,9 +771,9 @@ class Asset extends Depreciable
      * @since  1.0
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function assetmaintenances()
+    public function maintenances()
     {
-        return $this->hasMany(\App\Models\AssetMaintenance::class, 'asset_id')
+        return $this->hasMany(\App\Models\Maintenance::class, 'asset_id')
             ->orderBy('created_at', 'desc');
     }
 
diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php
index 8d080846d9..2c99330604 100755
--- a/app/Models/Supplier.php
+++ b/app/Models/Supplier.php
@@ -7,7 +7,7 @@ use App\Models\Traits\Searchable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
-
+use \Illuminate\Database\Eloquent\Relations\Relation;
 class Supplier extends SnipeModel
 {
     use HasFactory;
@@ -133,7 +133,7 @@ class Supplier extends SnipeModel
      * Establishes the supplier -> admin user relationship
      *
      * @author A. Gianotto <snipe@snipe.net>
-     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     * @return Relation
      */
     public function adminuser()
     {
@@ -147,9 +147,9 @@ class Supplier extends SnipeModel
      * @since  [v1.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function asset_maintenances()
+    public function maintenances(): Relation
     {
-        return $this->hasMany(\App\Models\AssetMaintenance::class, 'supplier_id');
+        return $this->hasMany(\App\Models\Maintenance::class, 'supplier_id');
     }
 
     /**
diff --git a/app/Models/User.php b/app/Models/User.php
index 6bd44380eb..48f7849d66 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -409,9 +409,9 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
      * @since  [v4.0]
      * @return \Illuminate\Database\Eloquent\Relations\Relation
      */
-    public function assetmaintenances()
+    public function maintenances()
     {
-        return $this->hasMany(\App\Models\AssetMaintenance::class, 'user_id')->withTrashed();
+        return $this->hasMany(\App\Models\Maintenance::class, 'user_id')->withTrashed();
     }
 
     /**
diff --git a/resources/lang/zu-ZA/admin/suppliers/message.php b/resources/lang/zu-ZA/admin/suppliers/message.php
index 2dd9a2f0dd..4a8e51c296 100644
--- a/resources/lang/zu-ZA/admin/suppliers/message.php
+++ b/resources/lang/zu-ZA/admin/suppliers/message.php
@@ -22,7 +22,7 @@ return array(
         'success' => 'Umphakeli ususiwe ngempumelelo.',
         'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
         'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
-        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
     )
 
 );
diff --git a/resources/views/partials/forms/edit/maintenance_type.blade.php b/resources/views/partials/forms/edit/maintenance_type.blade.php
index c11756a73d..c10e6ec7c0 100644
--- a/resources/views/partials/forms/edit/maintenance_type.blade.php
+++ b/resources/views/partials/forms/edit/maintenance_type.blade.php
@@ -1,14 +1,14 @@
           <!-- Improvement Type -->
           <div class="form-group {{ $errors->has('asset_maintenance_type') ? ' has-error' : '' }}">
-              <label for="asset_maintenance_type" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}
+              <label for="asset_maintenance_type" class="col-md-3 control-label">{{ trans('admin/maintenances/form.asset_maintenance_type') }}
               </label>
               <div class="col-md-7">
                   <x-input.select
                       name="asset_maintenance_type"
-                      :options="$assetMaintenanceType"
+                      :options="$maintenanceType"
                       :selected="old('asset_maintenance_type', $item->asset_maintenance_type)"
                       :required="Helper::checkIfRequired($item, 'asset_maintenance_type')"
-                      data-placeholder="{{ trans('admin/asset_maintenances/form.select_type')}}"
+                      data-placeholder="{{ trans('admin/maintenances/form.select_type')}}"
                       includeEmpty="true"
                       style="width:100%;"
                       aria-label="asset_maintenance_type"
diff --git a/resources/views/reports/asset_maintenances.blade.php b/resources/views/reports/asset_maintenances.blade.php
index fab64570f5..b641c0ca6c 100644
--- a/resources/views/reports/asset_maintenances.blade.php
+++ b/resources/views/reports/asset_maintenances.blade.php
@@ -30,19 +30,19 @@
                     <th data-field="company" data-sortable="false" data-visible="false" data-formatter="companiesLinkObjFormatter">{{ trans('admin/companies/table.title') }}</th>
                     <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
                     <th data-sortable="true" data-field="asset_tag" data-formatter="assetTagLinkFormatter" data-visible="false">{{ trans('general.asset_tag') }}</th>
-                    <th data-sortable="false" data-field="asset_name" data-formatter="assetNameLinkFormatter">{{ trans('admin/asset_maintenances/table.asset_name') }}</th>
+                    <th data-sortable="false" data-field="asset_name" data-formatter="assetNameLinkFormatter">{{ trans('admin/maintenances/table.asset_name') }}</th>
                     <th data-sortable="false" data-field="supplier" data-formatter="suppliersLinkObjFormatter">{{ trans('general.supplier') }}</th>
-                    <th data-searchable="true" data-sortable="true" data-field="asset_maintenance_type">{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}</th>
-                    <th data-searchable="true" data-sortable="true" data-field="title">{{ trans('admin/asset_maintenances/form.title') }}</th>
-                    <th data-searchable="true" data-sortable="false" data-field="start_date" data-formatter="dateDisplayFormatter">{{ trans('admin/asset_maintenances/form.start_date') }}</th>
-                    <th data-searchable="true" data-sortable="true" data-field="completion_date" data-formatter="dateDisplayFormatter">{{ trans('admin/asset_maintenances/form.completion_date') }}</th>
-                    <th data-searchable="true" data-sortable="true" data-field="asset_maintenance_time">{{ trans('admin/asset_maintenances/form.asset_maintenance_time') }}</th>
-                    <th data-searchable="true" data-sortable="true" data-field="cost" class="text-right" data-footer-formatter="sumFormatter">{{ trans('admin/asset_maintenances/form.cost') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="asset_maintenance_type">{{ trans('admin/maintenances/form.asset_maintenance_type') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="title">{{ trans('admin/maintenances/form.title') }}</th>
+                    <th data-searchable="true" data-sortable="false" data-field="start_date" data-formatter="dateDisplayFormatter">{{ trans('admin/maintenances/form.start_date') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="completion_date" data-formatter="dateDisplayFormatter">{{ trans('admin/maintenances/form.completion_date') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="asset_maintenance_time">{{ trans('admin/maintenances/form.asset_maintenance_time') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="cost" class="text-right" data-footer-formatter="sumFormatter">{{ trans('admin/maintenances/form.cost') }}</th>
                     <th data-sortable="true" data-field="location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('general.location') }}</th>
                     <th data-sortable="true" data-field="rtd_location" data-formatter="deployedLocationFormatter" data-visible="false">{{ trans('admin/hardware/form.default_location') }}</th>
-                    <th data-searchable="true" data-sortable="true" data-field="is_warranty" data-formatter="trueFalseFormatter">{{ trans('admin/asset_maintenances/table.is_warranty') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="is_warranty" data-formatter="trueFalseFormatter">{{ trans('admin/maintenances/table.is_warranty') }}</th>
                     <th data-searchable="true" data-sortable="true" data-field="user_id" data-formatter="usersLinkObjFormatter">{{ trans('general.created_by') }}</th>
-                    <th data-searchable="true" data-sortable="true" data-field="notes" data-visible="false">{{ trans('admin/asset_maintenances/form.notes') }}</th>
+                    <th data-searchable="true" data-sortable="true" data-field="notes" data-visible="false">{{ trans('admin/maintenances/form.notes') }}</th>
                 </tr>
                 </thead>
             </table>
diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php
index 19357f0fad..60667345ea 100755
--- a/resources/views/suppliers/view.blade.php
+++ b/resources/views/suppliers/view.blade.php
@@ -95,8 +95,8 @@
                         <x-icon type="maintenances" class="fa-2x" />
                     </span>
               <span class="hidden-xs hidden-sm">
-                        {{ trans('admin/asset_maintenances/general.asset_maintenances') }}
-                        {!! ($supplier->asset_maintenances->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->asset_maintenances->count()).'</span>' : '' !!}
+                        {{ trans('admin/maintenances/general.maintenances') }}
+                        {!! ($supplier->maintenances->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($supplier->maintenances->count()).'</span>' : '' !!}
                     </span>
             </a>
           </li>
@@ -220,11 +220,11 @@
 
 
           <div class="tab-pane" id="maintenances">
-            <h2 class="box-title">{{ trans('admin/asset_maintenances/general.asset_maintenances') }}</h2>
+            <h2 class="box-title">{{ trans('admin/maintenances/general.maintenances') }}</h2>
             <div class="table table-responsive">
 
               <table
-                      data-columns="{{ \App\Presenters\AssetMaintenancesPresenter::dataTableLayout() }}"
+                      data-columns="{{ \App\Presenters\MaintenancesPresenter::dataTableLayout() }}"
                       data-cookie-id-table="maintenancesTable"
                       data-id-table="maintenancesTable"
                       data-side-pagination="server"
diff --git a/routes/api.php b/routes/api.php
index faa94954fc..be8983aba3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1314,7 +1314,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
             'index'
         ]
     )->name('api.files.index')
-        ->where(['object_type' => 'assets|asset_maintenance|hardware|models|users|locations|accessories|consumables|licenses|components']);
+        ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']);
 
     // Get a file
     Route::get('{object_type}/{id}/files/{file_id}',
@@ -1323,7 +1323,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
             'show'
         ]
     )->name('api.files.show')
-        ->where(['object_type' => 'assets|asset_maintenance|hardware|models|users|locations|accessories|consumables|licenses|components']);
+        ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']);
 
     // Upload files(s)
     Route::post('{object_type}/{id}/files',
@@ -1332,7 +1332,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
             'store'
         ]
     )->name('api.files.store')
-        ->where(['object_type' => 'assets|asset_maintenance|hardware|models|users|locations|accessories|consumables|licenses|components']);
+        ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']);
 
     // Delete files(s)
     Route::delete('{object_type}/{id}/files/{file_id}/delete',
@@ -1341,6 +1341,6 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
             'destroy'
         ]
     )->name('api.files.destroy')
-        ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']);
+        ->where(['object_type' => 'accessories|assets|components|consumables|hardware|licenses|locations|maintenances|models|users']);
 
 }); // end API routes
diff --git a/routes/web.php b/routes/web.php
index 6833f5a24b..e03d4ff3ec 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -474,18 +474,18 @@ Route::group(['prefix' => 'reports', 'middleware' => ['auth']], function () {
             ->push(trans('general.depreciation_report'), route('reports.audit')));
 
     Route::get(
-        'asset_maintenances', [ReportsController::class, 'getMaintenancesReport'])
-        ->name('reports/asset_maintenances')
+        'maintenances', [ReportsController::class, 'getMaintenancesReport'])
+        ->name('reports/maintenances')
         ->breadcrumbs(fn (Trail $trail) =>
         $trail->parent('home')
-            ->push(trans('general.asset_maintenance_report'), route('reports/asset_maintenances')));
+            ->push(trans('general.asset_maintenance_report'), route('reports/maintenances')));
 
     // Is this still used?
-    Route::get('export/asset_maintenances', [ReportsController::class, 'exportMaintenancesReport'])
-        ->name('reports/export/asset_maintenances')
+    Route::get('export/maintenances', [ReportsController::class, 'exportMaintenancesReport'])
+        ->name('reports/export/maintenances')
         ->breadcrumbs(fn (Trail $trail) =>
         $trail->parent('home')
-            ->push(trans('general.asset_maintenance_report'), route('reports/export/asset_maintenances')));
+            ->push(trans('general.asset_maintenance_report'), route('reports/export/maintenances')));
 
     Route::get('licenses', [ReportsController::class, 'getLicenseReport'])
         ->name('reports/licenses')