@toolproof-npm/schema 0.1.43 → 0.1.45

package/dist/genesis/generated/resources/Genesis.json

@@ -1,31 +1,31 @@
 {
     "Genesis": {
         "identity": "RESOURCE-Genesis",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Genesis"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Genesis"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {}
     },
-    "Name": {
-        "identity": "RESOURCE-Name",
-        "resourceTypeId": "TYPE-ResourceType",
+    "Named": {
+        "identity": "RESOURCE-Named",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Name"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Named"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-Name",
-            "name": "Name",
+            "identity": "TYPE-Named",
+            "name": "Named",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "Name",
+                "$anchor": "Named",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -43,22 +43,22 @@
             }
         }
     },
-    "Description": {
-        "identity": "RESOURCE-Description",
-        "resourceTypeId": "TYPE-ResourceType",
+    "Described": {
+        "identity": "RESOURCE-Described",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Description"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Described"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-Description",
-            "name": "Description",
+            "identity": "TYPE-Described",
+            "name": "Described",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "Description",
+                "$anchor": "Described",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -77,10 +77,10 @@
     },
     "Documented": {
         "identity": "RESOURCE-Documented",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Documented"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Documented"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -88,38 +88,38 @@
             "identity": "TYPE-Documented",
             "name": "Documented",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "Documented",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/$defs/Name"
+                        "$ref": "#/$defs/Named"
                     },
                     {
-                        "$ref": "#/$defs/Description"
+                        "$ref": "#/$defs/Described"
                     }
                 ]
             }
         }
     },
-    "IdentityValue": {
-        "identity": "RESOURCE-IdentityValue",
-        "resourceTypeId": "TYPE-ResourceType",
+    "IdentitySchemaRef": {
+        "identity": "RESOURCE-IdentitySchemaRef",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-IdentityValue"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-IdentitySchemaRef"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-IdentityValue",
-            "name": "IdentityValue",
+            "identity": "TYPE-IdentitySchemaRef",
+            "name": "IdentitySchemaRef",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "IdentityValue",
+                "$anchor": "IdentitySchemaRef",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -128,36 +128,46 @@
                 "properties": {
                     "$ref": {
                         "type": "string",
-                        "$comment": "Supports both anchor syntax (#<Name>Id) and JSON Pointer syntax (#/path/to/definition). Anchors use #<Name>Id for identity refs. Top-level and nested $defs should expose an $anchor matching <Name>Id.",
-                        "pattern": "^#([A-Za-z][A-Za-z0-9._-]*Id|/.*)$"
+                        "$comment": "Supports both anchor syntax (#<Name>Identity) and JSON Pointer syntax (#/path/to/definition). Anchors use #<Name>Identity for identity refs. Top-level and nested $defs should expose an $anchor matching <Name>Identity.",
+                        "pattern": "^#([A-Za-z][A-Za-z0-9._-]*Identity|/.*)$"
                     }
                 },
                 "additionalProperties": false
             }
         }
     },
-    "IdSchemaValue": {
-        "identity": "RESOURCE-IdSchemaValue",
-        "resourceTypeId": "TYPE-ResourceType",
+    "IdentitySchema": {
+        "identity": "RESOURCE-IdentitySchema",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-IdSchemaValue"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-IdentitySchema"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-IdSchemaValue",
-            "name": "IdSchemaValue",
+            "identity": "TYPE-IdentitySchema",
+            "name": "IdentitySchema",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "IdSchemaValue",
+                "$anchor": "IdentitySchema",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
                     "type"
                 ],
                 "properties": {
+                    "$anchor": {
+                        "type": "string",
+                        "pattern": "^[A-Za-z][A-Za-z0-9._-]*Identity$"
+                    },
+                    "$schema": {
+                        "const": "https://json-schema.org/draft/2020-12/schema"
+                    },
+                    "$comment": {
+                        "type": "string"
+                    },
                     "type": {
                         "enum": [
                             "string",
@@ -165,17 +175,137 @@
                             "integer",
                             "boolean"
                         ]
+                    },
+                    "pattern": {
+                        "type": "string"
+                    },
+                    "format": {
+                        "type": "string"
+                    },
+                    "minLength": {
+                        "type": "integer",
+                        "minimum": 0
+                    },
+                    "maxLength": {
+                        "type": "integer",
+                        "minimum": 0
+                    },
+                    "enum": {
+                        "type": "array",
+                        "minItems": 1,
+                        "uniqueItems": true
                     }
-                }
+                },
+                "allOf": [
+                    {
+                        "if": {
+                            "properties": {
+                                "type": {
+                                    "const": "string"
+                                }
+                            }
+                        },
+                        "then": {
+                            "properties": {
+                                "enum": {
+                                    "items": {
+                                        "type": "string"
+                                    }
+                                }
+                            }
+                        },
+                        "else": {
+                            "not": {
+                                "anyOf": [
+                                    {
+                                        "required": [
+                                            "pattern"
+                                        ]
+                                    },
+                                    {
+                                        "required": [
+                                            "format"
+                                        ]
+                                    },
+                                    {
+                                        "required": [
+                                            "minLength"
+                                        ]
+                                    },
+                                    {
+                                        "required": [
+                                            "maxLength"
+                                        ]
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "if": {
+                            "properties": {
+                                "type": {
+                                    "const": "number"
+                                }
+                            }
+                        },
+                        "then": {
+                            "properties": {
+                                "enum": {
+                                    "items": {
+                                        "type": "number"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    {
+                        "if": {
+                            "properties": {
+                                "type": {
+                                    "const": "integer"
+                                }
+                            }
+                        },
+                        "then": {
+                            "properties": {
+                                "enum": {
+                                    "items": {
+                                        "type": "integer"
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    {
+                        "if": {
+                            "properties": {
+                                "type": {
+                                    "const": "boolean"
+                                }
+                            }
+                        },
+                        "then": {
+                            "properties": {
+                                "enum": {
+                                    "items": {
+                                        "type": "boolean"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                ],
+                "additionalProperties": false
             }
         }
     },
     "IdentityProp": {
         "identity": "RESOURCE-IdentityProp",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-IdentityProp"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-IdentityProp"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -183,7 +313,7 @@
             "identity": "TYPE-IdentityProp",
             "name": "IdentityProp",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "IdentityProp",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -197,13 +327,13 @@
                     "$defs": {
                         "type": "object",
                         "patternProperties": {
-                            "^[A-Za-z][A-Za-z0-9._-]*Id$": {
-                                "$ref": "#/$defs/IdSchemaValue"
+                            "^[A-Za-z][A-Za-z0-9._-]*Identity$": {
+                                "$ref": "#/$defs/IdentitySchema"
                             }
                         },
-                        "$comment": "Ajv-specific: patternRequired enforces at least one Id-like key in this $defs block when identity is present.",
+                        "$comment": "Ajv-specific: patternRequired enforces at least one Identity-like key in this $defs block when identity is present.",
                         "patternRequired": [
-                            "^[A-Za-z][A-Za-z0-9._-]*Id$"
+                            "^[A-Za-z][A-Za-z0-9._-]*Identity$"
                         ],
                         "minProperties": 1,
                         "additionalProperties": true
@@ -225,7 +355,7 @@
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/IdentityValue"
+                                "$ref": "#/$defs/IdentitySchemaRef"
                             }
                         }
                     }
@@ -233,24 +363,98 @@
             }
         }
     },
-    "MeritValue": {
-        "identity": "RESOURCE-MeritValue",
-        "resourceTypeId": "TYPE-ResourceType",
+    "MeritSchemaRef": {
+        "identity": "RESOURCE-MeritSchemaRef",
+        "resourceTypeRef": "TYPE-ResourceType",
+        "creationContext": {
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-MeritSchemaRef"
+        },
+        "kind": "materialized",
+        "timestamp": "2025-11-30T00:00:00.000Z",
+        "extractedData": {
+            "identity": "TYPE-MeritSchemaRef",
+            "name": "MeritSchemaRef",
+            "description": "dummy-description",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
+            "extractionSchema": {
+                "$anchor": "MeritSchemaRef",
+                "$schema": "https://json-schema.org/draft/2020-12/schema",
+                "type": "object",
+                "required": [
+                    "$ref"
+                ],
+                "properties": {
+                    "$ref": {
+                        "type": "string",
+                        "$comment": "Supports both anchor syntax (#<Name>Merit) and JSON Pointer syntax (#/path/to/definition). Anchors use #<Name>Merit for merit refs. Top-level and nested $defs should expose an $anchor matching <Name>Merit.",
+                        "pattern": "^#([A-Za-z][A-Za-z0-9._-]*Merit|/.*)$"
+                    }
+                },
+                "additionalProperties": false
+            }
+        }
+    },
+    "MeritSchema": {
+        "identity": "RESOURCE-MeritSchema",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-MeritValue"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-MeritSchema"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-MeritValue",
-            "name": "MeritValue",
+            "identity": "TYPE-MeritSchema",
+            "name": "MeritSchema",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "MeritValue",
+                "$anchor": "MeritSchema",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
+                "properties": {
+                    "$anchor": {
+                        "type": "string",
+                        "pattern": "^[A-Za-z][A-Za-z0-9._-]*Merit$"
+                    },
+                    "$schema": {
+                        "const": "https://json-schema.org/draft/2020-12/schema"
+                    },
+                    "$comment": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "enum": [
+                            "number",
+                            "integer"
+                        ]
+                    },
+                    "enum": {
+                        "type": "array",
+                        "items": {
+                            "type": "number"
+                        },
+                        "minItems": 1,
+                        "uniqueItems": true
+                    },
+                    "minimum": {
+                        "type": "number"
+                    },
+                    "maximum": {
+                        "type": "number"
+                    },
+                    "exclusiveMinimum": {
+                        "type": "number"
+                    },
+                    "exclusiveMaximum": {
+                        "type": "number"
+                    },
+                    "multipleOf": {
+                        "type": "number",
+                        "exclusiveMinimum": 0
+                    }
+                },
                 "oneOf": [
                     {
                         "required": [
@@ -279,56 +483,129 @@
                             }
                         }
                     }
-                ]
+                ],
+                "allOf": [
+                    {
+                        "$comment": "Numeric constraints (minimum/maximum/etc) only make sense when using the explicit type form; the enum-only form is allowed for simple enumerations.",
+                        "if": {
+                            "required": [
+                                "type"
+                            ]
+                        },
+                        "then": {},
+                        "else": {
+                            "not": {
+                                "anyOf": [
+                                    {
+                                        "required": [
+                                            "minimum"
+                                        ]
+                                    },
+                                    {
+                                        "required": [
+                                            "maximum"
+                                        ]
+                                    },
+                                    {
+                                        "required": [
+                                            "exclusiveMinimum"
+                                        ]
+                                    },
+                                    {
+                                        "required": [
+                                            "exclusiveMaximum"
+                                        ]
+                                    },
+                                    {
+                                        "required": [
+                                            "multipleOf"
+                                        ]
+                                    }
+                                ]
+                            }
+                        }
+                    }
+                ],
+                "additionalProperties": false
             }
         }
     },
     "MeritProp": {
         "identity": "RESOURCE-MeritProp",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-MeritProp"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-MeritProp"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
             "identity": "TYPE-MeritProp",
             "name": "MeritProp",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "MeritProp",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
+                "required": [
+                    "$defs",
+                    "required",
+                    "properties"
+                ],
                 "properties": {
+                    "$defs": {
+                        "type": "object",
+                        "patternProperties": {
+                            "^[A-Za-z][A-Za-z0-9._-]*Merit$": {
+                                "$ref": "#/$defs/MeritSchema"
+                            }
+                        },
+                        "$comment": "Ajv-specific: patternRequired enforces at least one Merit-like key in this $defs block when merit is present.",
+                        "patternRequired": [
+                            "^[A-Za-z][A-Za-z0-9._-]*Merit$"
+                        ],
+                        "minProperties": 1,
+                        "additionalProperties": true
+                    },
+                    "required": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        },
+                        "uniqueItems": true
+                    },
                     "properties": {
                         "type": "object",
+                        "required": [
+                            "merit"
+                        ],
                         "properties": {
                             "merit": {
-                                "$ref": "#/$defs/MeritValue"
+                                "$ref": "#/$defs/MeritSchemaRef"
                             }
                         }
                     }
-                }
+                },
+                "additionalProperties": false
             }
         }
     },
-    "ExtractionSchemaValue": {
-        "identity": "RESOURCE-ExtractionSchemaValue",
-        "resourceTypeId": "TYPE-ResourceType",
+    "ExtractionSchema": {
+        "identity": "RESOURCE-ExtractionSchema",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ExtractionSchemaValue"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ExtractionSchema"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-ExtractionSchemaValue",
-            "name": "ExtractionSchemaValue",
+            "identity": "TYPE-ExtractionSchema",
+            "name": "ExtractionSchema",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "ExtractionSchemaValue",
+                "$anchor": "ExtractionSchema",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -406,14 +683,28 @@
                     },
                     {
                         "if": {
-                            "properties": {
-                                "properties": {
-                                    "type": "object",
+                            "anyOf": [
+                                {
                                     "properties": {
-                                        "merit": {}
+                                        "properties": {
+                                            "type": "object",
+                                            "properties": {
+                                                "merit": {}
+                                            }
+                                        }
+                                    }
+                                },
+                                {
+                                    "properties": {
+                                        "required": {
+                                            "type": "array",
+                                            "contains": {
+                                                "const": "merit"
+                                            }
+                                        }
                                     }
                                 }
-                            }
+                            ]
                         },
                         "then": {
                             "$ref": "#/$defs/MeritProp"
@@ -438,22 +729,22 @@
             }
         }
     },
-    "ExtractionSchema": {
-        "identity": "RESOURCE-ExtractionSchema",
-        "resourceTypeId": "TYPE-ResourceType",
+    "ExtractionSchemaWrapper": {
+        "identity": "RESOURCE-ExtractionSchemaWrapper",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ExtractionSchema"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ExtractionSchemaWrapper"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-ExtractionSchema",
-            "name": "ExtractionSchema",
+            "identity": "TYPE-ExtractionSchemaWrapper",
+            "name": "ExtractionSchemaWrapper",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "ExtractionSchema",
+                "$anchor": "ExtractionSchemaWrapper",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -461,50 +752,50 @@
                 ],
                 "properties": {
                     "extractionSchema": {
-                        "$ref": "#/$defs/ExtractionSchemaValue"
+                        "$ref": "#/$defs/ExtractionSchema"
                     }
                 }
             }
         }
     },
-    "ResourceFormatId": {
-        "identity": "RESOURCE-ResourceFormatId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "ResourceFormatIdentity": {
+        "identity": "RESOURCE-ResourceFormatIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceFormatId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceFormatIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-ResourceFormatId",
-            "name": "ResourceFormatId",
+            "identity": "TYPE-ResourceFormatIdentity",
+            "name": "ResourceFormatIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatIdentity": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "ResourceFormatId",
+                "$anchor": "ResourceFormatIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^FORMAT-.+$"
             }
         }
     },
-    "ResourceTypeId": {
-        "identity": "RESOURCE-ResourceTypeId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "ResourceTypeIdentity": {
+        "identity": "RESOURCE-ResourceTypeIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceTypeId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceTypeIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-ResourceTypeId",
-            "name": "ResourceTypeId",
+            "identity": "TYPE-ResourceTypeIdentity",
+            "name": "ResourceTypeIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "ResourceTypeId",
+                "$anchor": "ResourceTypeIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^TYPE-.+$"
@@ -513,10 +804,10 @@
     },
     "ResourceType": {
         "identity": "RESOURCE-ResourceType",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceType"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceType"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -524,7 +815,7 @@
             "identity": "TYPE-ResourceType",
             "name": "ResourceType",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourceType",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -533,14 +824,14 @@
                     {
                         "required": [
                             "identity",
-                            "resourceFormatId"
+                            "resourceFormatRef"
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/ResourceTypeId"
+                                "$ref": "#/$defs/ResourceTypeIdentity"
                             },
-                            "resourceFormatId": {
-                                "$ref": "#/$defs/ResourceFormatId"
+                            "resourceFormatRef": {
+                                "$ref": "#/$defs/ResourceFormatIdentity"
                             }
                         }
                     },
@@ -548,13 +839,13 @@
                         "$ref": "#/$defs/Documented"
                     },
                     {
-                        "$ref": "#/$defs/ExtractionSchema"
+                        "$ref": "#/$defs/ExtractionSchemaWrapper"
                     },
                     {
                         "if": {
-                            "$comment": "If resourceFormatId is FORMAT-ApplicationJson, then extractor must not be present, but if resourceFormatId is not FORMAT-ApplicationJson, then extractor must be present. This is because resources of types with format FORMAT-ApplicationJson are self-contained and do not need an extractor.",
+                            "$comment": "If resourceFormatRef is FORMAT-ApplicationJson, then extractor must not be present, but if resourceFormatRef is not FORMAT-ApplicationJson, then extractor must be present. This is because resources of types with format FORMAT-ApplicationJson are self-contained and do not need an extractor.",
                             "properties": {
-                                "resourceFormatId": {
+                                "resourceFormatRef": {
                                     "const": "FORMAT-ApplicationJson"
                                 }
                             }
@@ -585,10 +876,10 @@
     },
     "ResourceFormat": {
         "identity": "RESOURCE-ResourceFormat",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceFormat"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceFormat"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -596,7 +887,7 @@
             "identity": "TYPE-ResourceFormat",
             "name": "ResourceFormat",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourceFormat",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -608,7 +899,7 @@
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/ResourceFormatId"
+                                "$ref": "#/$defs/ResourceFormatIdentity"
                             }
                         }
                     },
@@ -619,44 +910,44 @@
             }
         }
     },
-    "ResourceRoleId": {
-        "identity": "RESOURCE-ResourceRoleId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "ResourceRoleIdentity": {
+        "identity": "RESOURCE-ResourceRoleIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceRoleId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceRoleIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-ResourceRoleId",
-            "name": "ResourceRoleId",
+            "identity": "TYPE-ResourceRoleIdentity",
+            "name": "ResourceRoleIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "ResourceRoleId",
+                "$anchor": "ResourceRoleIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^ROLE-.+$"
             }
         }
     },
-    "ResourceId": {
-        "identity": "RESOURCE-ResourceId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "ResourceIdentity": {
+        "identity": "RESOURCE-ResourceIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-ResourceId",
-            "name": "ResourceId",
+            "identity": "TYPE-ResourceIdentity",
+            "name": "ResourceIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "ResourceId",
+                "$anchor": "ResourceIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "$comment": "",
@@ -666,10 +957,10 @@
     },
     "ResourceRoleValue": {
         "identity": "RESOURCE-ResourceRoleValue",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceRoleValue"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceRoleValue"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -677,20 +968,20 @@
             "identity": "TYPE-ResourceRoleValue",
             "name": "ResourceRoleValue",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourceRoleValue",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "allOf": [
                     {
-                        "$comment": "A ResourceRole does not have a self-contained identity, as it is always defined in the context of a RoleMap.",
+                        "$comment": "A ResourceRole does not have a self-contained identity, as it is always defined in the context of a RoleMap. ResourceRoleValue uses the Value suffix to mean 'the value stored in this map' (RoleMap.additionalProperties).",
                         "required": [
-                            "resourceTypeId"
+                            "resourceTypeRef"
                         ],
                         "properties": {
-                            "resourceTypeId": {
-                                "$ref": "#/$defs/ResourceTypeId"
+                            "resourceTypeRef": {
+                                "$ref": "#/$defs/ResourceTypeIdentity"
                             }
                         }
                     },
@@ -703,10 +994,10 @@
     },
     "RoleMap": {
         "identity": "RESOURCE-RoleMap",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-RoleMap"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-RoleMap"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -714,13 +1005,13 @@
             "identity": "TYPE-RoleMap",
             "name": "RoleMap",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "RoleMap",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "propertyNames": {
-                    "$ref": "#/$defs/ResourceRoleId"
+                    "$ref": "#/$defs/ResourceRoleIdentity"
                 },
                 "additionalProperties": {
                     "$ref": "#/$defs/ResourceRoleValue"
@@ -728,22 +1019,22 @@
             }
         }
     },
-    "RolesInner": {
-        "identity": "RESOURCE-RolesInner",
-        "resourceTypeId": "TYPE-ResourceType",
+    "Roles": {
+        "identity": "RESOURCE-Roles",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-RolesInner"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Roles"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-RolesInner",
-            "name": "RolesInner",
+            "identity": "TYPE-Roles",
+            "name": "Roles",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "RolesInner",
+                "$anchor": "Roles",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -762,22 +1053,22 @@
             }
         }
     },
-    "RolesOuter": {
-        "identity": "RESOURCE-RolesOuter",
-        "resourceTypeId": "TYPE-ResourceType",
+    "RolesWrapper": {
+        "identity": "RESOURCE-RolesWrapper",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-RolesOuter"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-RolesWrapper"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-RolesOuter",
-            "name": "RolesOuter",
+            "identity": "TYPE-RolesWrapper",
+            "name": "RolesWrapper",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "RolesOuter",
+                "$anchor": "RolesWrapper",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -785,29 +1076,28 @@
                 ],
                 "properties": {
                     "roles": {
-                        "$ref": "#/$defs/RolesInner"
+                        "$ref": "#/$defs/Roles"
                     }
                 }
             }
         }
     },
-    "JobId": {
-        "identity": "RESOURCE-JobId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "JobIdentity": {
+        "identity": "RESOURCE-JobIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-JobId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-JobIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-JobId",
-            "name": "JobId",
+            "identity": "TYPE-JobIdentity",
+            "name": "JobIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
-            "jobFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "JobId",
+                "$anchor": "JobIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "$comment": "",
@@ -817,10 +1107,10 @@
     },
     "Job": {
         "identity": "RESOURCE-Job",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Job"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Job"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -828,7 +1118,7 @@
             "identity": "TYPE-Job",
             "name": "Job",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJob",
+            "resourceFormatRef": "FORMAT-ApplicationJob",
             "extractor": "https://extractors.toolproof.com/v0/JobExtractor.js",
             "extractionSchema": {
                 "$anchor": "Job",
@@ -838,13 +1128,13 @@
                     {
                         "required": [
                             "identity",
-                            "implementation"
+                            "implementationUri"
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/JobId"
+                                "$ref": "#/$defs/JobIdentity"
                             },
-                            "implementation": {
+                            "implementationUri": {
                                 "type": "string",
                                 "format": "uri"
                             }
@@ -854,7 +1144,7 @@
                         "$ref": "#/$defs/Documented"
                     },
                     {
-                        "$ref": "#/$defs/RolesOuter"
+                        "$ref": "#/$defs/RolesWrapper"
                     }
                 ],
                 "unevaluatedProperties": false
@@ -863,10 +1153,10 @@
     },
     "RoleBindingMap": {
         "identity": "RESOURCE-RoleBindingMap",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-RoleBindingMap"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-RoleBindingMap"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -874,36 +1164,36 @@
             "identity": "TYPE-RoleBindingMap",
             "name": "RoleBindingMap",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "RoleBindingMap",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "propertyNames": {
-                    "$ref": "#/$defs/ResourceRoleId"
+                    "$ref": "#/$defs/ResourceRoleIdentity"
                 },
                 "additionalProperties": {
-                    "$ref": "#/$defs/ResourceId"
+                    "$ref": "#/$defs/ResourceIdentity"
                 }
             }
         }
     },
-    "RoleBindingsInner": {
-        "identity": "RESOURCE-RoleBindingsInner",
-        "resourceTypeId": "TYPE-ResourceType",
+    "RoleBindings": {
+        "identity": "RESOURCE-RoleBindings",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-RoleBindingsInner"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-RoleBindings"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-RoleBindingsInner",
-            "name": "RoleBindingsInner",
+            "identity": "TYPE-RoleBindings",
+            "name": "RoleBindings",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "RoleBindingsInner",
+                "$anchor": "RoleBindings",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -922,22 +1212,22 @@
             }
         }
     },
-    "RoleBindingsOuter": {
-        "identity": "RESOURCE-RoleBindingsOuter",
-        "resourceTypeId": "TYPE-ResourceType",
+    "RoleBindingsWrapper": {
+        "identity": "RESOURCE-RoleBindingsWrapper",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-RoleBindingsOuter"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-RoleBindingsWrapper"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-RoleBindingsOuter",
-            "name": "RoleBindingsOuter",
+            "identity": "TYPE-RoleBindingsWrapper",
+            "name": "RoleBindingsWrapper",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "RoleBindingsOuter",
+                "$anchor": "RoleBindingsWrapper",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -945,61 +1235,61 @@
                 ],
                 "properties": {
                     "roleBindings": {
-                        "$ref": "#/$defs/RoleBindingsInner"
+                        "$ref": "#/$defs/RoleBindings"
                     }
                 }
             }
         }
     },
-    "CreationContextValue": {
-        "identity": "RESOURCE-CreationContextValue",
-        "resourceTypeId": "TYPE-ResourceType",
+    "CreationContext": {
+        "identity": "RESOURCE-CreationContext",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-CreationContextValue"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-CreationContext"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-CreationContextValue",
-            "name": "CreationContextValue",
+            "identity": "TYPE-CreationContext",
+            "name": "CreationContext",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "CreationContextValue",
+                "$anchor": "CreationContext",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
-                    "resourceRoleId",
-                    "executionId"
+                    "resourceRoleRef",
+                    "executionRef"
                 ],
                 "properties": {
-                    "resourceRoleId": {
-                        "$ref": "#/$defs/ResourceRoleId"
+                    "resourceRoleRef": {
+                        "$ref": "#/$defs/ResourceRoleIdentity"
                     },
-                    "executionId": {
-                        "$ref": "#/$defs/ExecutionId"
+                    "executionRef": {
+                        "$ref": "#/$defs/ExecutionIdentity"
                     }
                 }
             }
         }
     },
-    "CreationContext": {
-        "identity": "RESOURCE-CreationContext",
-        "resourceTypeId": "TYPE-ResourceType",
+    "CreationContextWrapper": {
+        "identity": "RESOURCE-CreationContextWrapper",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-CreationContext"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-CreationContextWrapper"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-CreationContext",
-            "name": "CreationContext",
+            "identity": "TYPE-CreationContextWrapper",
+            "name": "CreationContextWrapper",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "CreationContext",
+                "$anchor": "CreationContextWrapper",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -1007,7 +1297,7 @@
                 ],
                 "properties": {
                     "creationContext": {
-                        "$ref": "#/$defs/CreationContextValue"
+                        "$ref": "#/$defs/CreationContext"
                     }
                 }
             }
@@ -1015,10 +1305,10 @@
     },
     "ResourceBase": {
         "identity": "RESOURCE-ResourceBase",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceBase"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceBase"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1026,7 +1316,7 @@
             "identity": "TYPE-ResourceBase",
             "name": "ResourceBase",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourceBase",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1035,14 +1325,14 @@
                     {
                         "required": [
                             "identity",
-                            "resourceTypeId"
+                            "resourceTypeRef"
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/ResourceId"
+                                "$ref": "#/$defs/ResourceIdentity"
                             },
-                            "resourceTypeId": {
-                                "$ref": "#/$defs/ResourceTypeId"
+                            "resourceTypeRef": {
+                                "$ref": "#/$defs/ResourceTypeIdentity"
                             }
                         }
                     }
@@ -1052,10 +1342,10 @@
     },
     "ResourceKind": {
         "identity": "RESOURCE-ResourceKind",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceKind"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceKind"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1063,7 +1353,7 @@
             "identity": "TYPE-ResourceKind",
             "name": "ResourceKind",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourceKind",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1086,10 +1376,10 @@
     },
     "ResourceMissing": {
         "identity": "RESOURCE-ResourceMissing",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceMissing"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceMissing"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1097,7 +1387,7 @@
             "identity": "TYPE-ResourceMissing",
             "name": "ResourceMissing",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourceMissing",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1126,10 +1416,10 @@
     },
     "ResourcePotentialInput": {
         "identity": "RESOURCE-ResourcePotentialInput",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourcePotentialInput"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourcePotentialInput"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1137,7 +1427,7 @@
             "identity": "TYPE-ResourcePotentialInput",
             "name": "ResourcePotentialInput",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourcePotentialInput",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1147,7 +1437,7 @@
                         "$ref": "#/$defs/ResourceBase"
                     },
                     {
-                        "$ref": "#/$defs/CreationContext"
+                        "$ref": "#/$defs/CreationContextWrapper"
                     },
                     {
                         "$ref": "#/$defs/ResourceKind"
@@ -1169,10 +1459,10 @@
     },
     "ResourcePotentialOutput": {
         "identity": "RESOURCE-ResourcePotentialOutput",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourcePotentialOutput"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourcePotentialOutput"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1180,7 +1470,7 @@
             "identity": "TYPE-ResourcePotentialOutput",
             "name": "ResourcePotentialOutput",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourcePotentialOutput",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1190,7 +1480,7 @@
                         "$ref": "#/$defs/ResourceBase"
                     },
                     {
-                        "$ref": "#/$defs/CreationContext"
+                        "$ref": "#/$defs/CreationContextWrapper"
                     },
                     {
                         "$ref": "#/$defs/ResourceKind"
@@ -1212,10 +1502,10 @@
     },
     "Timestamp": {
         "identity": "RESOURCE-Timestamp",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Timestamp"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Timestamp"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1223,7 +1513,7 @@
             "identity": "TYPE-Timestamp",
             "name": "Timestamp",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "Timestamp",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1242,10 +1532,10 @@
     },
     "Path": {
         "identity": "RESOURCE-Path",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Path"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Path"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1253,7 +1543,7 @@
             "identity": "TYPE-Path",
             "name": "Path",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "Path",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1271,10 +1561,10 @@
     },
     "ResourceMetaBase": {
         "identity": "RESOURCE-ResourceMetaBase",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceMetaBase"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceMetaBase"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1282,7 +1572,7 @@
             "identity": "TYPE-ResourceMetaBase",
             "name": "ResourceMetaBase",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourceMetaBase",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1292,7 +1582,7 @@
                         "$ref": "#/$defs/ResourceBase"
                     },
                     {
-                        "$ref": "#/$defs/CreationContext"
+                        "$ref": "#/$defs/CreationContextWrapper"
                     },
                     {
                         "$ref": "#/$defs/ResourceKind"
@@ -1319,10 +1609,10 @@
     },
     "ResourceMeta": {
         "identity": "RESOURCE-ResourceMeta",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ResourceMeta"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ResourceMeta"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1330,7 +1620,7 @@
             "identity": "TYPE-ResourceMeta",
             "name": "ResourceMeta",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ResourceMeta",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1340,22 +1630,22 @@
             }
         }
     },
-    "JsonValue": {
-        "identity": "RESOURCE-JsonValue",
-        "resourceTypeId": "TYPE-ResourceType",
+    "JsonData": {
+        "identity": "RESOURCE-JsonData",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-JsonValue"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-JsonData"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-JsonValue",
-            "name": "JsonValue",
+            "identity": "TYPE-JsonData",
+            "name": "JsonData",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "JsonValue",
+                "$anchor": "JsonData",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "oneOf": [
                     {
@@ -1373,13 +1663,13 @@
                     {
                         "type": "array",
                         "items": {
-                            "$ref": "#/$defs/JsonValue"
+                            "$ref": "#/$defs/JsonData"
                         }
                     },
                     {
                         "type": "object",
                         "additionalProperties": {
-                            "$ref": "#/$defs/JsonValue"
+                            "$ref": "#/$defs/JsonData"
                         }
                     }
                 ]
@@ -1388,10 +1678,10 @@
     },
     "Resource": {
         "identity": "RESOURCE-Resource",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Resource"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Resource"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1399,7 +1689,7 @@
             "identity": "TYPE-Resource",
             "name": "Resource",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "Resource",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1417,7 +1707,7 @@
                                 "$comment": "This will be overlayed at runtime to match the data structure of the underlying type's extractionSchema. At compile time, we guarantee it has an identity property.",
                                 "type": "object",
                                 "additionalProperties": {
-                                    "$ref": "#/$defs/JsonValue"
+                                    "$ref": "#/$defs/JsonData"
                                 }
                             }
                         }
@@ -1427,22 +1717,22 @@
             }
         }
     },
-    "ExecutionId": {
-        "identity": "RESOURCE-ExecutionId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "ExecutionIdentity": {
+        "identity": "RESOURCE-ExecutionIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ExecutionId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ExecutionIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-ExecutionId",
-            "name": "ExecutionId",
+            "identity": "TYPE-ExecutionIdentity",
+            "name": "ExecutionIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "ExecutionId",
+                "$anchor": "ExecutionIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^EXECUTION-.+$"
@@ -1451,10 +1741,10 @@
     },
     "Execution": {
         "identity": "RESOURCE-Execution",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Execution"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Execution"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1462,7 +1752,7 @@
             "identity": "TYPE-Execution",
             "name": "Execution",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "Execution",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1472,41 +1762,41 @@
                         "type": "object",
                         "required": [
                             "identity",
-                            "jobId"
+                            "jobRef"
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/ExecutionId"
+                                "$ref": "#/$defs/ExecutionIdentity"
                             },
-                            "jobId": {
-                                "$ref": "#/$defs/JobId"
+                            "jobRef": {
+                                "$ref": "#/$defs/JobIdentity"
                             }
                         }
                     },
                     {
                         "$comment": "This will be overlayed at runtime to specify roleBindings corresponding to the roles of the underlying job.",
-                        "$ref": "#/$defs/RoleBindingsOuter"
+                        "$ref": "#/$defs/RoleBindingsWrapper"
                     }
                 ]
             }
         }
     },
-    "ConditionalWrapper": {
-        "identity": "RESOURCE-ConditionalWrapper",
-        "resourceTypeId": "TYPE-ResourceType",
+    "Conditional": {
+        "identity": "RESOURCE-Conditional",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ConditionalWrapper"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Conditional"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-ConditionalWrapper",
-            "name": "ConditionalWrapper",
+            "identity": "TYPE-Conditional",
+            "name": "Conditional",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "ConditionalWrapper",
+                "$anchor": "Conditional",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -1527,10 +1817,10 @@
     },
     "StepKind": {
         "identity": "RESOURCE-StepKind",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-StepKind"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-StepKind"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1538,7 +1828,7 @@
             "identity": "TYPE-StepKind",
             "name": "StepKind",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "StepKind",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1560,22 +1850,22 @@
             }
         }
     },
-    "WorkStepId": {
-        "identity": "RESOURCE-WorkStepId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "WorkStepIdentity": {
+        "identity": "RESOURCE-WorkStepIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-WorkStepId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-WorkStepIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-WorkStepId",
-            "name": "WorkStepId",
+            "identity": "TYPE-WorkStepIdentity",
+            "name": "WorkStepIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "WorkStepId",
+                "$anchor": "WorkStepIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^WORKSTEP-.+$"
@@ -1584,10 +1874,10 @@
     },
     "WorkStep": {
         "identity": "RESOURCE-WorkStep",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-WorkStep"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-WorkStep"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1595,7 +1885,7 @@
             "identity": "TYPE-WorkStep",
             "name": "WorkStep",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "WorkStep",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1613,7 +1903,7 @@
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/WorkStepId"
+                                "$ref": "#/$defs/WorkStepIdentity"
                             },
                             "kind": {
                                 "const": "work"
@@ -1627,22 +1917,22 @@
             }
         }
     },
-    "BranchStepId": {
-        "identity": "RESOURCE-BranchStepId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "BranchStepIdentity": {
+        "identity": "RESOURCE-BranchStepIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-BranchStepId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-BranchStepIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-BranchStepId",
-            "name": "BranchStepId",
+            "identity": "TYPE-BranchStepIdentity",
+            "name": "BranchStepIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "BranchStepId",
+                "$anchor": "BranchStepIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^BRANCHSTEP-.+$"
@@ -1651,10 +1941,10 @@
     },
     "BranchStep": {
         "identity": "RESOURCE-BranchStep",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-BranchStep"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-BranchStep"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1662,7 +1952,7 @@
             "identity": "TYPE-BranchStep",
             "name": "BranchStep",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "BranchStep",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1680,7 +1970,7 @@
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/BranchStepId"
+                                "$ref": "#/$defs/BranchStepIdentity"
                             },
                             "kind": {
                                 "const": "branch"
@@ -1688,7 +1978,7 @@
                             "cases": {
                                 "type": "array",
                                 "items": {
-                                    "$ref": "#/$defs/ConditionalWrapper"
+                                    "$ref": "#/$defs/Conditional"
                                 },
                                 "minItems": 1,
                                 "uniqueItems": true
@@ -1699,22 +1989,22 @@
             }
         }
     },
-    "WhileStepId": {
-        "identity": "RESOURCE-WhileStepId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "WhileStepIdentity": {
+        "identity": "RESOURCE-WhileStepIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-WhileStepId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-WhileStepIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-WhileStepId",
-            "name": "WhileStepId",
+            "identity": "TYPE-WhileStepIdentity",
+            "name": "WhileStepIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "WhileStepId",
+                "$anchor": "WhileStepIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^WHILESTEP-.+$"
@@ -1723,10 +2013,10 @@
     },
     "WhileStep": {
         "identity": "RESOURCE-WhileStep",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-WhileStep"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-WhileStep"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1734,7 +2024,7 @@
             "identity": "TYPE-WhileStep",
             "name": "WhileStep",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "WhileStep",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1752,13 +2042,13 @@
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/WhileStepId"
+                                "$ref": "#/$defs/WhileStepIdentity"
                             },
                             "kind": {
                                 "const": "while"
                             },
                             "case": {
-                                "$ref": "#/$defs/ConditionalWrapper"
+                                "$ref": "#/$defs/Conditional"
                             }
                         }
                     }
@@ -1766,22 +2056,22 @@
             }
         }
     },
-    "ForStepId": {
-        "identity": "RESOURCE-ForStepId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "ForStepIdentity": {
+        "identity": "RESOURCE-ForStepIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ForStepId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ForStepIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-ForStepId",
-            "name": "ForStepId",
+            "identity": "TYPE-ForStepIdentity",
+            "name": "ForStepIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "ForStepId",
+                "$anchor": "ForStepIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^FORSTEP-.+$"
@@ -1790,10 +2080,10 @@
     },
     "ForStep": {
         "identity": "RESOURCE-ForStep",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-ForStep"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-ForStep"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1801,7 +2091,7 @@
             "identity": "TYPE-ForStep",
             "name": "ForStep",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "ForStep",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1819,13 +2109,13 @@
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/ForStepId"
+                                "$ref": "#/$defs/ForStepIdentity"
                             },
                             "kind": {
                                 "const": "for"
                             },
                             "case": {
-                                "$ref": "#/$defs/ConditionalWrapper"
+                                "$ref": "#/$defs/Conditional"
                             }
                         }
                     }
@@ -1835,10 +2125,10 @@
     },
     "Step": {
         "identity": "RESOURCE-Step",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-Step"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-Step"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1846,7 +2136,7 @@
             "identity": "TYPE-Step",
             "name": "Step",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "Step",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1869,22 +2159,22 @@
             }
         }
     },
-    "StatelessStrategyId": {
-        "identity": "RESOURCE-StatelessStrategyId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "StatelessStrategyIdentity": {
+        "identity": "RESOURCE-StatelessStrategyIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-StatelessStrategyId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-StatelessStrategyIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-StatelessStrategyId",
-            "name": "StatelessStrategyId",
+            "identity": "TYPE-StatelessStrategyIdentity",
+            "name": "StatelessStrategyIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "StatelessStrategyId",
+                "$anchor": "StatelessStrategyIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^STATELESS_STRATEGY-.+$"
@@ -1893,10 +2183,10 @@
     },
     "StatelessStrategy": {
         "identity": "RESOURCE-StatelessStrategy",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-StatelessStrategy"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-StatelessStrategy"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -1904,7 +2194,7 @@
             "identity": "TYPE-StatelessStrategy",
             "name": "StatelessStrategy",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "StatelessStrategy",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -1918,7 +2208,7 @@
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/StatelessStrategyId"
+                                "$ref": "#/$defs/StatelessStrategyIdentity"
                             },
                             "steps": {
                                 "type": "array",
@@ -1934,31 +2224,31 @@
             }
         }
     },
-    "StrategyStateValue": {
-        "identity": "RESOURCE-StrategyStateValue",
-        "resourceTypeId": "TYPE-ResourceType",
+    "StrategyState": {
+        "identity": "RESOURCE-StrategyState",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-StrategyStateValue"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-StrategyState"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-StrategyStateValue",
-            "name": "StrategyStateValue",
+            "identity": "TYPE-StrategyState",
+            "name": "StrategyState",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "StrategyStateValue",
+                "$anchor": "StrategyState",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "propertyNames": {
-                    "$ref": "#/$defs/ExecutionId"
+                    "$ref": "#/$defs/ExecutionIdentity"
                 },
                 "additionalProperties": {
                     "type": "object",
                     "propertyNames": {
-                        "$ref": "#/$defs/ResourceRoleId"
+                        "$ref": "#/$defs/ResourceRoleIdentity"
                     },
                     "additionalProperties": {
                         "oneOf": [
@@ -1980,22 +2270,22 @@
             }
         }
     },
-    "StrategyState": {
-        "identity": "RESOURCE-StrategyState",
-        "resourceTypeId": "TYPE-ResourceType",
+    "StrategyStateWrapper": {
+        "identity": "RESOURCE-StrategyStateWrapper",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-StrategyState"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-StrategyStateWrapper"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-StrategyState",
-            "name": "StrategyState",
+            "identity": "TYPE-StrategyStateWrapper",
+            "name": "StrategyStateWrapper",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "StrategyState",
+                "$anchor": "StrategyStateWrapper",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "required": [
@@ -2003,28 +2293,28 @@
                 ],
                 "properties": {
                     "strategyState": {
-                        "$ref": "#/$defs/StrategyStateValue"
+                        "$ref": "#/$defs/StrategyState"
                     }
                 }
             }
         }
     },
-    "StatefulStrategyId": {
-        "identity": "RESOURCE-StatefulStrategyId",
-        "resourceTypeId": "TYPE-ResourceType",
+    "StatefulStrategyIdentity": {
+        "identity": "RESOURCE-StatefulStrategyIdentity",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-StatefulStrategyId"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-StatefulStrategyIdentity"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
         "extractedData": {
-            "identity": "TYPE-StatefulStrategyId",
-            "name": "StatefulStrategyId",
+            "identity": "TYPE-StatefulStrategyIdentity",
+            "name": "StatefulStrategyIdentity",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
-                "$anchor": "StatefulStrategyId",
+                "$anchor": "StatefulStrategyIdentity",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "string",
                 "pattern": "^STATEFUL_STRATEGY-.+$"
@@ -2033,10 +2323,10 @@
     },
     "StatefulStrategy": {
         "identity": "RESOURCE-StatefulStrategy",
-        "resourceTypeId": "TYPE-ResourceType",
+        "resourceTypeRef": "TYPE-ResourceType",
         "creationContext": {
-            "resourceRoleId": "ROLE-Genesis",
-            "executionId": "EXECUTION-StatefulStrategy"
+            "resourceRoleRef": "ROLE-Genesis",
+            "executionRef": "EXECUTION-StatefulStrategy"
         },
         "kind": "materialized",
         "timestamp": "2025-11-30T00:00:00.000Z",
@@ -2044,7 +2334,7 @@
             "identity": "TYPE-StatefulStrategy",
             "name": "StatefulStrategy",
             "description": "dummy-description",
-            "resourceFormatId": "FORMAT-ApplicationJson",
+            "resourceFormatRef": "FORMAT-ApplicationJson",
             "extractionSchema": {
                 "$anchor": "StatefulStrategy",
                 "$schema": "https://json-schema.org/draft/2020-12/schema",
@@ -2057,7 +2347,7 @@
                         ],
                         "properties": {
                             "identity": {
-                                "$ref": "#/$defs/StatefulStrategyId"
+                                "$ref": "#/$defs/StatefulStrategyIdentity"
                             },
                             "statelessStrategy": {
                                 "$ref": "#/$defs/StatelessStrategy"
@@ -2065,7 +2355,7 @@
                         }
                     },
                     {
-                        "$ref": "#/$defs/StrategyState"
+                        "$ref": "#/$defs/StrategyStateWrapper"
                     }
                 ]
             }