diff --git a/data/model/digital-asset.mjson b/data/model/digital-asset.mjson
index b4a216231..3b4710fa8 100644
--- a/data/model/digital-asset.mjson
+++ b/data/model/digital-asset.mjson
@@ -93,7 +93,7 @@
     "secureLocation": {
         "prototype": "core/meta/property-descriptor",
         "values": {
-            "name": "signedLocation",
+            "name": "secureLocation",
             "valueType": "URL"
         }
     },
diff --git a/data/model/geo/circle.mjson b/data/model/geo/circle.mjson
index 816a9631e..0a865d0a2 100644
--- a/data/model/geo/circle.mjson
+++ b/data/model/geo/circle.mjson
@@ -1,7 +1,7 @@
 {
     "root": {
         "prototype": "core/meta/module-object-descriptor",
-        "properties": {
+        "values": {
             "name": "Circle",
             "propertyDescriptors": [
                 {"@": "coordinates"},
@@ -25,7 +25,7 @@
 
     "coordinates": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "coordinates",
             "cardinality": 1,
             "valueDescriptor": {"@": "PositionDescriptor"}
@@ -34,7 +34,7 @@
 
     "radius": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "radius",
             "valueType": "number"
         }
diff --git a/data/model/geo/geometry.mjson b/data/model/geo/geometry.mjson
index 9c9efed14..c1dd8a822 100644
--- a/data/model/geo/geometry.mjson
+++ b/data/model/geo/geometry.mjson
@@ -1,7 +1,7 @@
 {
     "root": {
         "prototype": "core/meta/module-object-descriptor",
-        "properties": {
+        "values": {
             "name": "Geometry",
             "propertyDescriptors": [
                 {"@": "identifier"},
@@ -16,7 +16,7 @@
 
     "identifier": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "identifier",
             "valueType": "string"
         }
@@ -24,7 +24,7 @@
 
     "coordinates": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "coordinates",
             "valueType": "object"
         }
diff --git a/data/model/geo/line-string.mjson b/data/model/geo/line-string.mjson
index 0291656c2..c36be2206 100644
--- a/data/model/geo/line-string.mjson
+++ b/data/model/geo/line-string.mjson
@@ -1,7 +1,7 @@
 {
     "root": {
         "prototype": "core/meta/module-object-descriptor",
-        "properties": {
+        "values": {
             "name": "LineString",
             "parent": {"@": "geometry"},
             "propertyDescriptors": [
@@ -21,7 +21,7 @@
 
     "identifier": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "identifier",
             "valueType": "string"
         }
@@ -33,7 +33,7 @@
 
     "coordinates": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "coordinates",
             "cardinality": -1,
             "valueType": "array",
diff --git a/data/model/geo/multi-line-string.mjson b/data/model/geo/multi-line-string.mjson
index 9fae78a20..5bca0bad5 100644
--- a/data/model/geo/multi-line-string.mjson
+++ b/data/model/geo/multi-line-string.mjson
@@ -1,7 +1,7 @@
 {
     "root": {
         "prototype": "core/meta/module-object-descriptor",
-        "properties": {
+        "values": {
             "name": "MultiLineString",
             "parent": {"@": "geometry"},
             "propertyDescriptors": [
@@ -21,7 +21,7 @@
 
     "identifier": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "identifier",
             "valueType": "string"
         }
@@ -33,7 +33,7 @@
 
     "coordinates": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "coordinates",
             "description": "The coordinates member of a multi-line string is an array of line string geometries.",
             "cardinality": -1,
diff --git a/data/model/geo/multi-point.mjson b/data/model/geo/multi-point.mjson
index c50728e47..24f7d4d1f 100644
--- a/data/model/geo/multi-point.mjson
+++ b/data/model/geo/multi-point.mjson
@@ -1,7 +1,7 @@
 {
     "root": {
         "prototype": "core/meta/module-object-descriptor",
-        "properties": {
+        "values": {
             "name": "MultiPoint",
             "parent": {"@": "geometry"},
             "propertyDescriptors": [
@@ -21,7 +21,7 @@
 
     "identifier": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "identifier",
             "valueType": "string"
         }
@@ -33,7 +33,7 @@
 
     "coordinates": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "coordinates",
             "cardinality": -1,
             "valueType": "array",
diff --git a/data/model/geo/multi-polygon.mjson b/data/model/geo/multi-polygon.mjson
index c6acf4b53..7e96e4b31 100644
--- a/data/model/geo/multi-polygon.mjson
+++ b/data/model/geo/multi-polygon.mjson
@@ -1,7 +1,7 @@
 {
     "root": {
         "prototype": "core/meta/module-object-descriptor",
-        "properties": {
+        "values": {
             "name": "MultiPolygon",
             "parent": {"@": "geometry"},
             "propertyDescriptors": [
@@ -21,7 +21,7 @@
 
     "identifier": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "identifier",
             "valueType": "string"
         }
@@ -33,7 +33,7 @@
 
     "coordinates": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "coordinates",
             "cardinality": -1,
             "valueType": "array",
diff --git a/data/model/geo/point.mjson b/data/model/geo/point.mjson
index bf340ddce..e46057a86 100644
--- a/data/model/geo/point.mjson
+++ b/data/model/geo/point.mjson
@@ -1,7 +1,7 @@
 {
     "root": {
         "prototype": "core/meta/module-object-descriptor",
-        "properties": {
+        "values": {
             "name": "Point",
             "parent": {"@": "geometry"},
             "propertyDescriptors": [
@@ -21,7 +21,7 @@
 
     "identifier": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "identifier",
             "valueType": "string"
         }
@@ -33,7 +33,7 @@
 
     "coordinates": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "coordinates",
             "cardinality": 1,
             "valueType": "object",
diff --git a/data/model/geo/polygon.mjson b/data/model/geo/polygon.mjson
index b331f475e..5847b1de7 100644
--- a/data/model/geo/polygon.mjson
+++ b/data/model/geo/polygon.mjson
@@ -1,7 +1,7 @@
 {
     "root": {
         "prototype": "core/meta/module-object-descriptor",
-        "properties": {
+        "values": {
             "name": "Polygon",
             "parent": {"@": "geometry"},
             "propertyDescriptors": [
@@ -21,7 +21,7 @@
 
     "identifier": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "identifier",
             "valueType": "string"
         }
@@ -33,7 +33,7 @@
 
     "coordinates": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "coordinates",
             "cardinality": -1,
             "valueType": "array",
diff --git a/data/model/geo/position.mjson b/data/model/geo/position.mjson
index dd735c9d7..000da51f8 100644
--- a/data/model/geo/position.mjson
+++ b/data/model/geo/position.mjson
@@ -56,7 +56,7 @@
 
     "projection": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "projection",
             "cardinality": 1,
             "valueType": "object",
diff --git a/data/model/geo/projection.mjson b/data/model/geo/projection.mjson
index a5aa16787..f24b2ab18 100644
--- a/data/model/geo/projection.mjson
+++ b/data/model/geo/projection.mjson
@@ -35,7 +35,7 @@
 
     "units": {
         "prototype": "core/meta/property-descriptor",
-        "properties": {
+        "values": {
             "name": "units",
             "cardinality": 1,
             "valueType": "object"
diff --git a/data/model/identity.mjson b/data/model/identity.mjson
index a6be5c034..2dbbf3c80 100644
--- a/data/model/identity.mjson
+++ b/data/model/identity.mjson
@@ -34,7 +34,7 @@
     "provider": {
         "prototype": "../../core/meta/property-descriptor",
         "values": {
-            "name": "scope",
+            "name": "provider",
             "cardinality": -1,
             "valueType": "object",
             "valueDescriptor": {"@": "IdentityProviderDescriptor"},
@@ -46,7 +46,7 @@
         "object": "./party/organization.mjson"
     },
     "ownerOrganization": {
-        "prototype": "core/meta/property-descriptor",
+        "prototype": "../../core/meta/property-descriptor",
         "values": {
             "name": "ownerOrganization",
             "cardinality": 1,
diff --git a/data/model/ordering-rule.mjson b/data/model/ordering-rule.mjson
index f80b10e12..11a63845b 100644
--- a/data/model/ordering-rule.mjson
+++ b/data/model/ordering-rule.mjson
@@ -30,7 +30,7 @@
                     { "@": "orderDescriptor" }
                 ]
             },
-            "propertyvalidationRules": [],
+            "validationRules": [],
             "objectDescriptorModule": { "%": "./ordering-rule.mjson" },
             "exportName": "OrderingRule",
             "module": { "%": "./ordering-rule" },
diff --git a/data/model/physical-dimension.mjson b/data/model/physical-dimension.mjson
index 4875daad2..aae8b9613 100644
--- a/data/model/physical-dimension.mjson
+++ b/data/model/physical-dimension.mjson
@@ -27,7 +27,7 @@
     "name": {
         "prototype": "core/meta/property-descriptor",
         "values": {
-            "name": "value",
+            "name": "name",
             "valueType": "string"
         }
     },
diff --git a/data/model/unit.mjson b/data/model/unit.mjson
index c64fa1535..bcdeebab5 100644
--- a/data/model/unit.mjson
+++ b/data/model/unit.mjson
@@ -27,7 +27,7 @@
     "name": {
         "prototype": "core/meta/property-descriptor",
         "values": {
-            "name": "value",
+            "name": "name",
             "valueType": "string"
         }
     },
diff --git a/data/model/variable.mjson b/data/model/variable.mjson
index 06e0cf553..c31c48933 100644
--- a/data/model/variable.mjson
+++ b/data/model/variable.mjson
@@ -75,7 +75,7 @@
             "cardinality": 1,
             "valueType": "object",
             "valueDescriptor": {"@": "DataObjectDescriptor"},
-            "description": "The scope object, high level, to be secialized, on which the expression is to be evaluated to produce a value for this variable"
+            "description": "The scope object, high level, to be serialized, on which the expression is to be evaluated to produce a value for this variable"
         }
     }