diff --git a/src/tests/unit/common/entity/validators/mock_data/CarRental.blueprint.json b/src/tests/unit/common/entity/validators/mock_data/CarRental.blueprint.json
index b612a8f81..581e8c0f4 100644
--- a/src/tests/unit/common/entity/validators/mock_data/CarRental.blueprint.json
+++ b/src/tests/unit/common/entity/validators/mock_data/CarRental.blueprint.json
@@ -1,17 +1,10 @@
 {
   "name": "CarRental",
   "type": "system/SIMOS/Blueprint",
+  "extends": [
+    "dmss://system/SIMOS/NamedEntity"
+  ],
   "attributes": [
-    {
-      "name": "name",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string"
-    },
-    {
-      "name": "type",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string"
-    },
     {
       "name": "cars",
       "type": "system/SIMOS/BlueprintAttribute",
diff --git a/src/tests/unit/common/entity/validators/mock_data/CarTest.blueprint.json b/src/tests/unit/common/entity/validators/mock_data/CarTest.blueprint.json
index 6f5e1023b..2ea09de2d 100644
--- a/src/tests/unit/common/entity/validators/mock_data/CarTest.blueprint.json
+++ b/src/tests/unit/common/entity/validators/mock_data/CarTest.blueprint.json
@@ -1,19 +1,10 @@
 {
   "name": "CarTest",
   "type": "system/SIMOS/Blueprint",
+  "extends": [
+    "dmss://system/SIMOS/NamedEntity"
+  ],
   "attributes": [
-    {
-      "name": "name",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string",
-      "default": "CarTest"
-    },
-    {
-      "name": "type",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string",
-      "default": "CarTest"
-    },
     {
       "name": "plateNumber",
       "type": "system/SIMOS/BlueprintAttribute",
diff --git a/src/tests/unit/common/entity/validators/mock_data/EngineTest.blueprint.json b/src/tests/unit/common/entity/validators/mock_data/EngineTest.blueprint.json
index eee51a2fc..643111b97 100644
--- a/src/tests/unit/common/entity/validators/mock_data/EngineTest.blueprint.json
+++ b/src/tests/unit/common/entity/validators/mock_data/EngineTest.blueprint.json
@@ -2,22 +2,10 @@
   "name": "EngineTest",
   "type": "system/SIMOS/Blueprint",
   "description": "This describes an engine",
+  "extends": [
+    "dmss://system/SIMOS/NamedEntity"
+  ],
   "attributes": [
-    {
-      "name": "name",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string"
-    },
-    {
-      "name": "type",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string"
-    },
-    {
-      "name": "description",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string"
-    },
     {
       "name": "power",
       "type": "system/SIMOS/BlueprintAttribute",
diff --git a/src/tests/unit/common/entity/validators/mock_data/FuelPumpTest.blueprint.json b/src/tests/unit/common/entity/validators/mock_data/FuelPumpTest.blueprint.json
index f7c196223..54dbafdd7 100644
--- a/src/tests/unit/common/entity/validators/mock_data/FuelPumpTest.blueprint.json
+++ b/src/tests/unit/common/entity/validators/mock_data/FuelPumpTest.blueprint.json
@@ -2,22 +2,7 @@
   "name": "FuelPumpTest",
   "type": "system/SIMOS/Blueprint",
   "description": "This describes a fuel pump",
-  "attributes": [
-    {
-      "name": "name",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string"
-    },
-    {
-      "name": "description",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string",
-      "default": "A standard fuel pump"
-    },
-    {
-      "name": "type",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string"
-    }
+  "extends": [
+    "dmss://system/SIMOS/NamedEntity"
   ]
 }
diff --git a/src/tests/unit/common/entity/validators/mock_data/RentalCar.blueprint.json b/src/tests/unit/common/entity/validators/mock_data/RentalCar.blueprint.json
index 6c345da0d..b54dfe56e 100644
--- a/src/tests/unit/common/entity/validators/mock_data/RentalCar.blueprint.json
+++ b/src/tests/unit/common/entity/validators/mock_data/RentalCar.blueprint.json
@@ -1,19 +1,10 @@
 {
   "name": "RentalCar",
   "type": "system/SIMOS/Blueprint",
+  "extends": [
+    "dmss://system/SIMOS/NamedEntity"
+  ],
   "attributes": [
-    {
-      "name": "name",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string",
-      "default": "RentalCar"
-    },
-    {
-      "name": "type",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string",
-      "default": "RentalCar"
-    },
     {
       "name": "plateNumber",
       "type": "system/SIMOS/BlueprintAttribute",
diff --git a/src/tests/unit/common/entity/validators/mock_data/WheelTest.blueprint.json b/src/tests/unit/common/entity/validators/mock_data/WheelTest.blueprint.json
index b344a25c1..d9a721110 100644
--- a/src/tests/unit/common/entity/validators/mock_data/WheelTest.blueprint.json
+++ b/src/tests/unit/common/entity/validators/mock_data/WheelTest.blueprint.json
@@ -1,18 +1,10 @@
 {
   "name": "WheelTest",
   "type": "system/SIMOS/Blueprint",
+  "extends": [
+    "dmss://system/SIMOS/NamedEntity"
+  ],
   "attributes": [
-    {
-      "name": "name",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string",
-      "default": "Wheel"
-    },
-    {
-      "name": "type",
-      "type": "system/SIMOS/BlueprintAttribute",
-      "attributeType": "string"
-    },
     {
       "name": "power",
       "type": "system/SIMOS/BlueprintAttribute",