diff --git a/data/model/device/device.mjson b/data/model/device/device.mjson
index 8955ce6..beb6cd6 100644
--- a/data/model/device/device.mjson
+++ b/data/model/device/device.mjson
@@ -26,6 +26,10 @@
                 {"@": "nodeDeviceConnections"},
                 {"@": "possibleHostDeviceConnections"},
                 {"@": "hostDeviceConnections"},
+                {"@": "deviceHostConnections"},
+
+                {"@": "tools"},
+                {"@": "toolForDevices"},
 
                 {"@": "ipAddress"},
                 {"@": "port"},
@@ -255,17 +259,6 @@
         }
     },
 
-    "toolCompatibilityDeviceList": {
-        "prototype": "mod/core/meta/property-descriptor",
-        "values": {
-            "name": "toolCompatibilityDeviceList",
-            "cardinality": -1,
-            "inversePropertyName": "compatibleTools",
-            "valueDescriptor": {"@": "root"},
-            "description": "The list of devices that can use this device as a tools"
-        }
-    },
-
     "tools": {
         "prototype": "mod/core/meta/property-descriptor",
         "values": {
@@ -288,7 +281,6 @@
         }
     },
 
-    
     "ipAddress": {
         "prototype": "mod/core/meta/property-descriptor",
         "values": {
diff --git a/data/model/device/printing-device.mjson b/data/model/device/printing-device.mjson
index b4c145c..ae9b848 100644
--- a/data/model/device/printing-device.mjson
+++ b/data/model/device/printing-device.mjson
@@ -23,7 +23,7 @@
     "ImagingDeviceDescriptor": {
         "object": "./imaging-device.mjson"
     },
-    "ProntDocumentDescriptor": {
+    "PrintDocumentDescriptor": {
         "object": "./print-document.mjson"
     },
 
@@ -33,7 +33,7 @@
             "name": "activePrintDocument",
             "cardinality": 1,
             "valueType": "object",
-            "valueDescriptor": {"@": "ProntDocumentDescriptor"},
+            "valueDescriptor": {"@": "PrintDocumentDescriptor"},
             "description": "The current document to be printed"
         }
     }