diff --git a/Controller/ApiEquipmentAttributeController.php b/Controller/ApiEquipmentAttributeController.php
index 833c26c..afe8a5a 100644
--- a/Controller/ApiEquipmentAttributeController.php
+++ b/Controller/ApiEquipmentAttributeController.php
@@ -327,7 +327,7 @@ final class ApiEquipmentAttributeController extends Controller
             return;
         }
 
-        /** @var \Modules\EquipmentManagement\Models\EquipmentAttributeTypeL11n $equipmentAttributeTypeL11n */
+        /** @var BaseStringL11n $equipmentAttributeTypeL11n */
         $equipmentAttributeTypeL11n = EquipmentAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $this->deleteModel($request->header->account, $equipmentAttributeTypeL11n, EquipmentAttributeTypeL11nMapper::class, 'equipment_attribute_type_l11n', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $equipmentAttributeTypeL11n);
@@ -387,7 +387,7 @@ final class ApiEquipmentAttributeController extends Controller
             return;
         }
 
-        /** @var \Modules\EquipmentManagement\Models\EquipmentAttributeType $equipmentAttributeType */
+        /** @var AttributeType $equipmentAttributeType */
         $equipmentAttributeType = EquipmentAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $this->deleteModel($request->header->account, $equipmentAttributeType, EquipmentAttributeTypeMapper::class, 'equipment_attribute_type', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $equipmentAttributeType);
@@ -418,7 +418,7 @@ final class ApiEquipmentAttributeController extends Controller
         /** @var AttributeValue $old */
         $old = EquipmentAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute();
 
-        /** @var \Modules\Attribute\Models\Attribute $type */
+        /** @var \Modules\Attribute\Models\Attribute $attr */
         $attr = EquipmentAttributeMapper::get()
             ->with('type')
             ->where('id', $request->getDataInt('attribute') ?? 0)
@@ -514,7 +514,7 @@ final class ApiEquipmentAttributeController extends Controller
             return;
         }
 
-        /** @var \Modules\EquipmentManagement\Models\EquipmentAttributeValueL11n $equipmentAttributeValueL11n */
+        /** @var BaseStringL11n $equipmentAttributeValueL11n */
         $equipmentAttributeValueL11n = EquipmentAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $this->deleteModel($request->header->account, $equipmentAttributeValueL11n, EquipmentAttributeValueL11nMapper::class, 'equipment_attribute_value_l11n', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $equipmentAttributeValueL11n);
diff --git a/Controller/ApiEquipmentController.php b/Controller/ApiEquipmentController.php
index 29973fe..3dab16c 100755
--- a/Controller/ApiEquipmentController.php
+++ b/Controller/ApiEquipmentController.php
@@ -86,12 +86,12 @@ final class ApiEquipmentController extends Controller
      */
     public function createEquipmentFromRequest(RequestAbstract $request) : Equipment
     {
-        $equipment           = new Equipment();
-        $equipment->name     = $request->getDataString('name') ?? '';
-        $equipment->info     = $request->getDataString('info') ?? '';
-        $equipment->type     = new NullBaseStringL11nType((int) ($request->getDataInt('type') ?? 0));
-        $equipment->status   = $request->getDataInt('status') ?? EquipmentStatus::INACTIVE;
-        $equipment->unit     = $request->getDataInt('unit') ?? $this->app->unitId;
+        $equipment         = new Equipment();
+        $equipment->name   = $request->getDataString('name') ?? '';
+        $equipment->info   = $request->getDataString('info') ?? '';
+        $equipment->type   = new NullBaseStringL11nType((int) ($request->getDataInt('type') ?? 0));
+        $equipment->status = $request->getDataInt('status') ?? EquipmentStatus::INACTIVE;
+        $equipment->unit   = $request->getDataInt('unit') ?? $this->app->unitId;
 
         return $equipment;
     }
diff --git a/Controller/ApiEquipmentTypeController.php b/Controller/ApiEquipmentTypeController.php
index b848419..c3420b2 100644
--- a/Controller/ApiEquipmentTypeController.php
+++ b/Controller/ApiEquipmentTypeController.php
@@ -261,7 +261,7 @@ final class ApiEquipmentTypeController extends Controller
             return;
         }
 
-        /** @var \Modules\EquipmentManagement\Models\EquipmentType $equipmentType */
+        /** @var BaseStringL11nType $equipmentType */
         $equipmentType = EquipmentTypeMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $this->deleteModel($request->header->account, $equipmentType, EquipmentTypeMapper::class, 'equipment_type', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $equipmentType);
@@ -377,7 +377,7 @@ final class ApiEquipmentTypeController extends Controller
             return;
         }
 
-        /** @var \Modules\EquipmentManagement\Models\EquipmentTypeL11n $equipmentTypeL11n */
+        /** @var BaseStringL11n $equipmentTypeL11n */
         $equipmentTypeL11n = EquipmentTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $this->deleteModel($request->header->account, $equipmentTypeL11n, EquipmentTypeL11nMapper::class, 'equipment_type_l11n', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $equipmentTypeL11n);
diff --git a/Controller/ApiInspectionTypeController.php b/Controller/ApiInspectionTypeController.php
index a7a6078..a83c8fe 100644
--- a/Controller/ApiInspectionTypeController.php
+++ b/Controller/ApiInspectionTypeController.php
@@ -261,7 +261,7 @@ final class ApiInspectionTypeController extends Controller
             return;
         }
 
-        /** @var \Modules\EquipmentManagement\Models\InspectionType $equipmentType */
+        /** @var BaseStringL11nType $equipmentType */
         $equipmentType = InspectionTypeMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $this->deleteModel($request->header->account, $equipmentType, InspectionTypeMapper::class, 'equipment_type', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $equipmentType);
@@ -377,7 +377,7 @@ final class ApiInspectionTypeController extends Controller
             return;
         }
 
-        /** @var \Modules\EquipmentManagement\Models\InspectionTypeL11n $equipmentTypeL11n */
+        /** @var BaseStringL11n $equipmentTypeL11n */
         $equipmentTypeL11n = InspectionTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $this->deleteModel($request->header->account, $equipmentTypeL11n, InspectionTypeL11nMapper::class, 'equipment_type_l11n', $request->getOrigin());
         $this->createStandardDeleteResponse($request, $response, $equipmentTypeL11n);